ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject svn commit: r1306330 - in /ace/trunk: ace-glassfish-launcher/.classpath ace-glassfish-launcher/.project ace-glassfish-launcher/.settings/org.eclipse.jdt.core.prefs ace-obr-metadata/pom.xml
Date Wed, 28 Mar 2012 13:55:59 GMT
Author: jawi
Date: Wed Mar 28 13:55:59 2012
New Revision: 1306330

URL: http://svn.apache.org/viewvc?rev=1306330&view=rev
Log:
ACE-155: fixed the embedding of kxml2 as dependency.

Modified:
    ace/trunk/ace-glassfish-launcher/.classpath
    ace/trunk/ace-glassfish-launcher/.project
    ace/trunk/ace-glassfish-launcher/.settings/org.eclipse.jdt.core.prefs
    ace/trunk/ace-obr-metadata/pom.xml

Modified: ace/trunk/ace-glassfish-launcher/.classpath
URL: http://svn.apache.org/viewvc/ace/trunk/ace-glassfish-launcher/.classpath?rev=1306330&r1=1306329&r2=1306330&view=diff
==============================================================================
--- ace/trunk/ace-glassfish-launcher/.classpath (original)
+++ ace/trunk/ace-glassfish-launcher/.classpath Wed Mar 28 13:55:59 2012
@@ -1,42 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
-	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
-	<classpathentry excluding="**/*.java" kind="src" path="target/maven-shared-archive-resources"/>
-	<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-artifact/2.0/maven-artifact-2.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/mockito/mockito-all/1.8.1/mockito-all-1.8.1.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.deployment.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.deployment.api-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.deployment.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.deployment.api-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.deployment.deploymentadmin/0.8.1-incubator-SNAPSHOT/org.apache.ace.deployment.deploymentadmin-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.deployment.deploymentadmin/0.8.1-incubator-SNAPSHOT/org.apache.ace.deployment.deploymentadmin-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.deployment.provider.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.deployment.provider.api-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.deployment.provider.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.deployment.provider.api-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.deployment.task/0.8.1-incubator-SNAPSHOT/org.apache.ace.deployment.task-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.deployment.task/0.8.1-incubator-SNAPSHOT/org.apache.ace.deployment.task-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.discovery.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.discovery.api-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.discovery.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.discovery.api-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.discovery.property/0.8.1-incubator-SNAPSHOT/org.apache.ace.discovery.property-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.discovery.property/0.8.1-incubator-SNAPSHOT/org.apache.ace.discovery.property-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.gateway.log/0.8.1-incubator-SNAPSHOT/org.apache.ace.gateway.log-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.gateway.log/0.8.1-incubator-SNAPSHOT/org.apache.ace.gateway.log-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.gateway.log.store/0.8.1-incubator-SNAPSHOT/org.apache.ace.gateway.log.store-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.gateway.log.store/0.8.1-incubator-SNAPSHOT/org.apache.ace.gateway.log.store-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.identification.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.identification.api-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.identification.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.identification.api-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.identification.property/0.8.1-incubator-SNAPSHOT/org.apache.ace.identification.property-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.identification.property/0.8.1-incubator-SNAPSHOT/org.apache.ace.identification.property-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.log/0.8.1-incubator-SNAPSHOT/org.apache.ace.log-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.log/0.8.1-incubator-SNAPSHOT/org.apache.ace.log-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.log.listener/0.8.1-incubator-SNAPSHOT/org.apache.ace.log.listener-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.log.listener/0.8.1-incubator-SNAPSHOT/org.apache.ace.log.listener-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.managementagent/0.8.1-incubator-SNAPSHOT/org.apache.ace.managementagent-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.managementagent/0.8.1-incubator-SNAPSHOT/org.apache.ace.managementagent-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.range.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.range.api-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.range.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.range.api-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.scheduler/0.8.1-incubator-SNAPSHOT/org.apache.ace.scheduler-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.scheduler/0.8.1-incubator-SNAPSHOT/org.apache.ace.scheduler-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.scheduler.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.scheduler.api-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.scheduler.api/0.8.1-incubator-SNAPSHOT/org.apache.ace.scheduler.api-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/ace/org.apache.ace.util/0.8.1-incubator-SNAPSHOT/org.apache.ace.util-0.8.1-incubator-SNAPSHOT.jar"
sourcepath="M2_REPO/org/apache/ace/org.apache.ace.util/0.8.1-incubator-SNAPSHOT/org.apache.ace.util-0.8.1-incubator-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.configadmin/1.2.8/org.apache.felix.configadmin-1.2.8.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.dependencymanager/3.0.0/org.apache.felix.dependencymanager-3.0.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.deploymentadmin/0.9.0/org.apache.felix.deploymentadmin-0.9.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.eventadmin/1.2.8/org.apache.felix.eventadmin-1.2.8.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.8/org.apache.felix.framework-3.0.8.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.compendium/4.2.0/org.osgi.compendium-4.2.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/osgi/org.osgi.core/4.2.0/org.osgi.core-4.2.0.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-api/2.5/surefire-api-2.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/surefire/surefire-testng/2.5/surefire-testng-2.5.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/testng/testng/5.7/testng-5.7-jdk15.jar"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.scala-ide.sdt.launching.SCALA_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: ace/trunk/ace-glassfish-launcher/.project
URL: http://svn.apache.org/viewvc/ace/trunk/ace-glassfish-launcher/.project?rev=1306330&r1=1306329&r2=1306330&view=diff
==============================================================================
--- ace/trunk/ace-glassfish-launcher/.project (original)
+++ ace/trunk/ace-glassfish-launcher/.project Wed Mar 28 13:55:59 2012
@@ -1,13 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-  <name>ace-glassfish-launcher</name>
-  <comment>This pom provides project information that is common to all ACE sub-projects.
NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported
in M2Eclipse.</comment>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
+	<name>ace-glassfish-launcher</name>
+	<comment>This pom provides project information that is common to all ACE sub-projects.
NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported
in M2Eclipse.</comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

Modified: ace/trunk/ace-glassfish-launcher/.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/ace/trunk/ace-glassfish-launcher/.settings/org.eclipse.jdt.core.prefs?rev=1306330&r1=1306329&r2=1306330&view=diff
==============================================================================
--- ace/trunk/ace-glassfish-launcher/.settings/org.eclipse.jdt.core.prefs (original)
+++ ace/trunk/ace-glassfish-launcher/.settings/org.eclipse.jdt.core.prefs Wed Mar 28 13:55:59
2012
@@ -1,9 +1,9 @@
-#Tue Oct 25 23:16:29 CEST 2011
-encoding//src/test/java=UTF-8
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 eclipse.preferences.version=1
-encoding//src/test/resources=UTF-8
-org.eclipse.jdt.core.compiler.source=1.5
 encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
 org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5

Modified: ace/trunk/ace-obr-metadata/pom.xml
URL: http://svn.apache.org/viewvc/ace/trunk/ace-obr-metadata/pom.xml?rev=1306330&r1=1306329&r2=1306330&view=diff
==============================================================================
--- ace/trunk/ace-obr-metadata/pom.xml (original)
+++ ace/trunk/ace-obr-metadata/pom.xml Wed Mar 28 13:55:59 2012
@@ -59,7 +59,7 @@
             org.apache.ace.obr.metadata.bindex
         </private.package>
         <embed.dependency>
-        	artifactId=kxml2
+        	kxml2
         </embed.dependency>
         <bundle.activator>
             org.apache.ace.obr.metadata.bindex.Activator



Mime
View raw message