[java-metadata-aggregator COMMIT] in /trunk: aggregator-cli/ aggregator-cli/.classpath aggregator-cli/src/main/assemb...

[noreply at shibboleth.net]

Author: lajoie
Date: Sat Aug  6 16:22:01 2011
New Revision: 148

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=148&view=rev
Log:
migrate to eclipse 3.7 and parent-project configs

Removed:
    trunk/aggregator-parent/checkstyle.xml
    trunk/aggregator-parent/eclipse/
    trunk/aggregator-parent/externals.svn
Modified:
    trunk/aggregator-cli/   (props changed)
    trunk/aggregator-cli/.classpath
    trunk/aggregator-cli/src/main/assembly/bin.xml
    trunk/aggregator-parent/pom.xml
    trunk/aggregator-pipeline/   (props changed)
    trunk/aggregator-pipeline/.classpath
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/ValidateValidUntilStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/pipeline/StaticItemSourceStage.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/PipelineMergeStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/pipeline/SimplePipelineTest.java
    trunk/aggregator-web-service/   (props changed)
    trunk/aggregator-web-service/.classpath

Modified: trunk/aggregator-cli/.classpath
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-cli/.classpath?rev=148&r1=147&r2=148&view=diff
==============================================================================
--- trunk/aggregator-cli/.classpath (original)
+++ trunk/aggregator-cli/.classpath Sat Aug  6 16:22:01 2011
@@ -1,10 +1,16 @@
 <?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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+    <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
+    
 	<classpathentry kind="output" path="target/classes"/>
-</classpath>
+    
+</classpath>

Modified: trunk/aggregator-cli/src/main/assembly/bin.xml
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-cli/src/main/assembly/bin.xml?rev=148&r1=147&r2=148&view=diff
==============================================================================
--- trunk/aggregator-cli/src/main/assembly/bin.xml (original)
+++ trunk/aggregator-cli/src/main/assembly/bin.xml Sat Aug  6 16:22:01 2011
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
           
     <id>bin</id>
     <formats>

Modified: trunk/aggregator-parent/pom.xml
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-parent/pom.xml?rev=148&r1=147&r2=148&view=diff
==============================================================================
--- trunk/aggregator-parent/pom.xml (original)
+++ trunk/aggregator-parent/pom.xml Sat Aug  6 16:22:01 2011
@@ -1,7 +1,14 @@
 <?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</groupId>
+        <artifactId>parent</artifactId>
+        <version>1</version>
+    </parent>
 
     <name>Shibboleth Metadata Aggregator</name>
     <groupId>net.shibboleth.metadata</groupId>
@@ -18,36 +25,8 @@
     </modules>
 
     <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <target.java.version>1.6</target.java.version>
-        <slf4j.groupId>org.slf4j</slf4j.groupId>
-        <slf4j.version>1.6.1</slf4j.version>
-        <spring.groupId>org.springframework</spring.groupId>
-        <spring.version>3.0.5.RELEASE</spring.version>
-        <xerces.groupId>org.apache.xerces</xerces.groupId>
-        <xerces.version>2.10.0</xerces.version>
-        <xmlresolver.groupId>xml-resolver</xmlresolver.groupId>

[... 544 lines stripped ...]