[java-idp-testbed COMMIT] in /trunk: idp-testbed logback.launch pom.xml src/main/config/conf/attribute-resolver-confi...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Nov 14 15:26:31 2013
New Revision: 49

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=49&view=rev
Log:
Getting closer to resolving attributes from LDAP.

Add logback.configurationFile system property to pom.xml and Eclipse launcher. Move jetty.xml configuration from src/main/jetty to src/main/config/system/conf. Rename attribute-resolver-config.xml to attribute-resolver-service.xml.

Added:
    trunk/idp-testbed logback.launch
    trunk/src/main/config/conf/attribute-resolver-service.xml
      - copied, changed from r47, trunk/src/main/config/conf/attribute-resolver-config.xml
    trunk/src/main/config/system/conf/jetty.xml
      - copied unchanged from r48, trunk/src/main/jetty/jetty.xml
Modified:
    trunk/pom.xml
    trunk/src/main/config/conf/attribute-resolver-config.xml
    trunk/src/main/config/conf/attribute-resolver.xml
    trunk/src/main/config/conf/global-user.xml
    trunk/src/main/config/conf/logback.xml
    trunk/src/main/config/logback.xml
    trunk/src/main/config/system/flows/saml2/sso-abstract-beans.xml
    trunk/src/main/java/common/Main.java
    trunk/src/main/jetty/

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=49&r1=48&r2=49&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Thu Nov 14 15:26:31 2013
@@ -43,7 +43,7 @@
             <artifactId>idp-profile-impl</artifactId>
             <version>${idp.version}</version>
         </dependency>
-        
+
         <dependency>
             <groupId>${idp.groupId}</groupId>
             <artifactId>idp-attribute-resolver-spring</artifactId>
@@ -204,6 +204,26 @@
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>properties-maven-plugin</artifactId>
+                <version>1.0-alpha-2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>set-system-properties</goal>
+                        </goals>
+                        <configuration>
+                            <properties>
+                                <property>
+                                    <name>logback.configurationFile</name>
+                                    <value>${project.baseUri}/src/main/config/conf/logback.xml</value>
+                                </property>
+                            </properties>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
@@ -217,7 +237,7 @@
                         <webInfIncludeJarPattern>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</webInfIncludeJarPattern>
                     </webApp>
                     <jettyXml>
-                        ${project.basedir}/src/main/jetty/jetty.xml
+                        ${project.basedir}/src/main/config/system/conf/jetty.xml
                     </jettyXml>
                     <systemProperties>
                         <systemProperty>
@@ -235,6 +255,36 @@
                 </configuration>
             </plugin>
         </plugins>
+
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.codehaus.mojo</groupId>
+                                        <artifactId>properties-maven-plugin</artifactId>
+                                        <versionRange>[1.0-alpha-2,)</versionRange>
+                                        <goals>
+                                            <goal>set-system-properties</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
 </project>


[... 196 lines stripped ...]