You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ace.apache.org by ma...@apache.org on 2013/02/15 11:19:51 UTC
svn commit: r1446496 - in /ace/trunk: cnf/ext/
org.apache.ace.authentication.itest/
org.apache.ace.client.repository.itest/ org.apache.ace.client.rest.itest/
org.apache.ace.configurator.useradmin.itest/
org.apache.ace.deployment.itest/ org.apache.ace.h...
Author: marrs
Date: Fri Feb 15 10:19:51 2013
New Revision: 1446496
URL: http://svn.apache.org/r1446496
Log:
ACE-335 All eclipse projects now use the JRE settings of the workspace. For now, these have to be Java 6 as defined also in cnf/ext/defaults.bnd.
Modified:
ace/trunk/cnf/ext/defaults.bnd
ace/trunk/org.apache.ace.authentication.itest/.classpath
ace/trunk/org.apache.ace.client.repository.itest/.classpath
ace/trunk/org.apache.ace.client.rest.itest/.classpath
ace/trunk/org.apache.ace.configurator.useradmin.itest/.classpath
ace/trunk/org.apache.ace.deployment.itest/.classpath
ace/trunk/org.apache.ace.http.itest/.classpath
ace/trunk/org.apache.ace.identification.property/.classpath
ace/trunk/org.apache.ace.log.itest/.classpath
ace/trunk/org.apache.ace.repository.itest/.classpath
ace/trunk/org.apache.ace.server.log.store.itest/.classpath
ace/trunk/org.apache.ace.server.log.store/.classpath
ace/trunk/org.apache.ace.test/.classpath
ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath
ace/trunk/org.apache.ace.useradmin.ui/.classpath
ace/trunk/run-server/.classpath
ace/trunk/run-server/server.bndrun
ace/trunk/run-target/.classpath
Modified: ace/trunk/cnf/ext/defaults.bnd
URL: http://svn.apache.org/viewvc/ace/trunk/cnf/ext/defaults.bnd?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/cnf/ext/defaults.bnd (original)
+++ ace/trunk/cnf/ext/defaults.bnd Fri Feb 15 10:19:51 2013
@@ -20,8 +20,8 @@ project.name: ${p}
# Java Compiler Options
java: java
javac: javac
-javac.source: 1.5
-javac.target: 1.5
+javac.source: 1.6
+javac.target: 1.6
javac.debug: on
# Bnd Options
Modified: ace/trunk/org.apache.ace.authentication.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.authentication.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.authentication.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.authentication.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.client.repository.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.client.repository.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.client.rest.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.rest.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.rest.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.client.rest.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.configurator.useradmin.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.configurator.useradmin.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.configurator.useradmin.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.configurator.useradmin.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.deployment.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.deployment.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.deployment.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.deployment.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.http.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.http.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.http.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.http.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.identification.property/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.identification.property/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.identification.property/.classpath (original)
+++ ace/trunk/org.apache.ace.identification.property/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
-<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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
Modified: ace/trunk/org.apache.ace.log.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.log.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.log.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.log.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.repository.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.repository.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.repository.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.repository.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.server.log.store.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.server.log.store.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.server.log.store.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.server.log.store.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.server.log.store/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.server.log.store/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.server.log.store/.classpath (original)
+++ ace/trunk/org.apache.ace.server.log.store/.classpath Fri Feb 15 10:19:51 2013
@@ -4,6 +4,6 @@
<classpathentry kind="src" output="bin_test" path="test"/>
<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.test/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.test/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.test/.classpath (original)
+++ ace/trunk/org.apache.ace.test/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath (original)
+++ ace/trunk/org.apache.ace.useradmin.ui.itest/.classpath Fri Feb 15 10:19:51 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/org.apache.ace.useradmin.ui/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.useradmin.ui/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.useradmin.ui/.classpath (original)
+++ ace/trunk/org.apache.ace.useradmin.ui/.classpath Fri Feb 15 10:19:51 2013
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/run-server/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/run-server/.classpath (original)
+++ ace/trunk/run-server/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: ace/trunk/run-server/server.bndrun
URL: http://svn.apache.org/viewvc/ace/trunk/run-server/server.bndrun?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/run-server/server.bndrun (original)
+++ ace/trunk/run-server/server.bndrun Fri Feb 15 10:19:51 2013
@@ -1,4 +1,4 @@
--runfw: org.apache.felix.framework;version='[4.0.2,4.0.2]'
+-runfw: org.apache.felix.framework;version='[4,5)'
-runee: JavaSE-1.6
-runbundles: org.apache.felix.dependencymanager;version='[3.1.0,3.1.1)',\
org.apache.felix.useradmin;version='[1.0.2,1.0.3)',\
Modified: ace/trunk/run-target/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/run-target/.classpath?rev=1446496&r1=1446495&r2=1446496&view=diff
==============================================================================
--- ace/trunk/run-target/.classpath (original)
+++ ace/trunk/run-target/.classpath Fri Feb 15 10:19:51 2013
@@ -2,7 +2,7 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" output="bin_test" path="test"/>
- <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.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="aQute.bnd.classpath.container"/>
<classpathentry kind="output" path="bin"/>
</classpath>