[java-metadata-aggregator COMMIT] in /trunk: aggregator-distribution/.classpath aggregator-distribution/.project aggr...

[noreply at shibboleth.net]

Author: iay
Date: Tue Feb 11 11:16:56 2014
New Revision: 334

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=334&view=rev
Log:
Bring project up to date with newer conventions.

Added:
    trunk/aggregator-distribution/.classpath
    trunk/aggregator-distribution/.project
Modified:
    trunk/aggregator-distribution/pom.xml
    trunk/aggregator-web-service/.classpath
    trunk/aggregator-web-service/.project
    trunk/aggregator-web-service/pom.xml

Modified: trunk/aggregator-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-distribution/pom.xml?rev=334&r1=333&r2=334&view=diff
==============================================================================
--- trunk/aggregator-distribution/pom.xml (original)
+++ trunk/aggregator-distribution/pom.xml Tue Feb 11 11:16:56 2014
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>net.shibboleth.metadata</groupId>
-        <artifactId>aggregator-project</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <artifactId>aggregator-parent</artifactId>
+        <version>0.9-SNAPSHOT</version>
         <relativePath>../aggregator-parent</relativePath>
     </parent>
     
-    <groupId>net.shibboleth.metadata</groupId>
-    <artifactId>metadata-aggregator-standalone</artifactId>
-    <version>1.0-SNAPSHOT</version>
-
     <name>Shibboleth Metadata Aggregator :: Standalone Distribution</name>
+    <artifactId>aggregator-standalone</artifactId>
 
     <properties>
         <bundle-symbolic-name>${project.groupId}.${artifactId}</bundle-symbolic-name>

Modified: trunk/aggregator-web-service/.classpath
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-web-service/.classpath?rev=334&r1=333&r2=334&view=diff
==============================================================================
--- trunk/aggregator-web-service/.classpath (original)
+++ trunk/aggregator-web-service/.classpath Tue Feb 11 11:16:56 2014
@@ -1,16 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <classpath>
-
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-    
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
-    
-	<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.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
-    
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
-    
-</classpath>
+</classpath>

Modified: trunk/aggregator-web-service/.project
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-web-service/.project?rev=334&r1=333&r2=334&view=diff
==============================================================================
--- trunk/aggregator-web-service/.project (original)
+++ trunk/aggregator-web-service/.project Tue Feb 11 11:16:56 2014
@@ -4,26 +4,32 @@
 	<comment></comment>
 	<projects>
 	</projects>
-    <buildSpec>
-        <buildCommand>
-            <name>org.eclipse.jdt.core.javabuilder</name>
-            <arguments>

[... 70 lines stripped ...]