[java-idp-testbed COMMIT] /trunk/pom.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jun 22 12:34:38 2015
New Revision: 309

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=309&view=rev
Log:
IDP-749 Cleanup stale testbed POM

https://issues.shibboleth.net/jira/browse/IDP-749
Remove building an executable testbed WAR.
Remove ability to run the testbed via 'mvn jetty:run'.
Don't build a testbed distribution.
Bump testbed version to 0.2.0-SNAPSHOT.

Modified:
    trunk/pom.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=309&r1=308&r2=309&view=diff
==============================================================================
--- trunk/pom.xml	(original)
+++ trunk/pom.xml	Mon Jun 22 12:34:38 2015
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.shibboleth.idp</groupId>
     <artifactId>idp-testbed</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>0.2.0-SNAPSHOT</version>
     <packaging>war</packaging>
 
     <properties>
@@ -18,11 +18,6 @@
         <idp.version>3.2.0-SNAPSHOT</idp.version>
         <opensaml.groupId>org.opensaml</opensaml.groupId>
         <opensaml.version>3.2.0-SNAPSHOT</opensaml.version>
-        <!-- The assembly-directory is where the testbed is built before being archived. -->
-        <assembly-directory>${project.build.directory}/${project.artifactId}-${project.version}-distribution</assembly-directory>
-        <!-- TODO tz These paths are fragile. -->
-        <idp.home>${project.basedir}/../java-identity-provider/idp-conf/src/main/resources</idp.home>
-        <app.home>${project.basedir}/src/main/resources</app.home>
         <spring-extensions.version>5.2.0-SNAPSHOT</spring-extensions.version>
      </properties>
 
@@ -272,217 +267,4 @@
 
     </dependencies>
 
-    <build>
-        <plugins>
-            <!-- Set idp.home and app.home system properties to assembly directory for tests. -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemPropertyVariables>
-                        <idp.home>${assembly-directory}</idp.home>
-                        <app.home>${assembly-directory}</app.home>
-                    </systemPropertyVariables>
-                </configuration>
-            </plugin>
-            <!-- mvn:jetty run -->
-            <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>${jetty.version}</version>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                    <webApp>
-                        <contextPath>/</contextPath>
-                        <overrideDescriptor>src/main/resources/test/override-web.xml</overrideDescriptor>
-                        <!-- Startup faster. https://jira.codehaus.org/browse/JETTY-1503 -->
-                        <webInfIncludeJarPattern>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</webInfIncludeJarPattern>
-                    </webApp>
-                    <jettyXml>
-                        ${idp.home}/system/conf/jetty.xml
-                    </jettyXml>
-                    <systemProperties>
-                        <systemProperty>
-                            <name>idp.home</name>
-                            <value>${idp.home}</value>
-                        </systemProperty>
-                        <systemProperty>
-                            <name>app.home</name>
-                            <value>${app.home}</value>
-                        </systemProperty>
-                    </systemProperties>
-                    <systemPropertiesFile>${idp.home}/conf/idp.properties</systemPropertiesFile>
-                    <loginServices>
-                        <loginService implementation="org.eclipse.jetty.security.HashLoginService">
-                            <name>Shib Testbed Web Authentication</name>
-                            <config>src/main/resources/test/jetty-realm.properties</config>
-                        </loginService>
-                    </loginServices>
-                </configuration>
-            </plugin>
-            <!-- Copy src/main/resources to assembly directory. -->
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <includeEmptyDirs>true</includeEmptyDirs>
-                            <outputDirectory>${assembly-directory}</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>src/main/resources</directory>

[... 151 lines stripped ...]