Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Leicht Vogt2012-07-12 08:25:52 +0000
committerStephan Leicht Vogt2012-09-04 19:28:10 +0000
commit1c3dee87beb9be514bba71689a8f781178f1e6e0 (patch)
treeec218425792268638f0eab4d4e67e9bda1c7b7a3
parent6c5ae355d755e28d3887620c97910fea43d03bd6 (diff)
downloadorg.eclipse.scout.rt-1c3dee87beb9be514bba71689a8f781178f1e6e0.tar.gz
org.eclipse.scout.rt-1c3dee87beb9be514bba71689a8f781178f1e6e0.tar.xz
org.eclipse.scout.rt-1c3dee87beb9be514bba71689a8f781178f1e6e0.zip
correction of wrong changes to the apache.derby-fragment settings
-rw-r--r--org.apache.derby.jdbc_1053.fragment/.classpath4
-rw-r--r--org.apache.derby.jdbc_1053.fragment/.project6
-rw-r--r--org.apache.derby.jdbc_1053.fragment/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--org.apache.derby.jdbc_1082.fragment/.classpath4
-rw-r--r--org.apache.derby.jdbc_1082.fragment/.project6
-rw-r--r--org.apache.derby.jdbc_1082.fragment/.settings/org.eclipse.jdt.core.prefs7
6 files changed, 30 insertions, 4 deletions
diff --git a/org.apache.derby.jdbc_1053.fragment/.classpath b/org.apache.derby.jdbc_1053.fragment/.classpath
index d7e88b4137..e6985c9e51 100644
--- a/org.apache.derby.jdbc_1053.fragment/.classpath
+++ b/org.apache.derby.jdbc_1053.fragment/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
+ <classpathentry kind="output" path="build/classes"/>
</classpath>
diff --git a/org.apache.derby.jdbc_1053.fragment/.project b/org.apache.derby.jdbc_1053.fragment/.project
index cc1f9e2694..6d11f7bf43 100644
--- a/org.apache.derby.jdbc_1053.fragment/.project
+++ b/org.apache.derby.jdbc_1053.fragment/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -24,5 +29,6 @@
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.apache.derby.jdbc_1053.fragment/.settings/org.eclipse.jdt.core.prefs b/org.apache.derby.jdbc_1053.fragment/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..c537b63063
--- /dev/null
+++ b/org.apache.derby.jdbc_1053.fragment/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
diff --git a/org.apache.derby.jdbc_1082.fragment/.classpath b/org.apache.derby.jdbc_1082.fragment/.classpath
index d7e88b4137..e6985c9e51 100644
--- a/org.apache.derby.jdbc_1082.fragment/.classpath
+++ b/org.apache.derby.jdbc_1082.fragment/.classpath
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry exported="true" kind="lib" path="lib/derby.jar"/>
+ <classpathentry kind="output" path="build/classes"/>
</classpath>
diff --git a/org.apache.derby.jdbc_1082.fragment/.project b/org.apache.derby.jdbc_1082.fragment/.project
index 13d9af413b..9152236ab1 100644
--- a/org.apache.derby.jdbc_1082.fragment/.project
+++ b/org.apache.derby.jdbc_1082.fragment/.project
@@ -6,6 +6,11 @@
</projects>
<buildSpec>
<buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
@@ -24,5 +29,6 @@
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
diff --git a/org.apache.derby.jdbc_1082.fragment/.settings/org.eclipse.jdt.core.prefs b/org.apache.derby.jdbc_1082.fragment/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000000..c537b63063
--- /dev/null
+++ b/org.apache.derby.jdbc_1082.fragment/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6

Back to the top