Author: ilgrosso Date: Thu Mar 14 18:29:59 2013 New Revision: 1456601 URL: http://svn.apache.org/r1456601 Log: Glassfish and JBoss verified - note that for JBoss the OSGi stuff needs to be disabled until SYNCOPE-204
Added: syncope/trunk/core/src/test/resources/jboss/META-INF/ syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF Modified: syncope/trunk/core/pom.xml syncope/trunk/pom.xml Modified: syncope/trunk/core/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/core/pom.xml?rev=1456601&r1=1456600&r2=1456601&view=diff ============================================================================== --- syncope/trunk/core/pom.xml (original) +++ syncope/trunk/core/pom.xml Thu Mar 14 18:29:59 2013 @@ -1069,7 +1069,7 @@ under the License. <profile> <id>glassfish-it</id> - + <dependencies> <dependency> <groupId>com.h2database</groupId> @@ -1113,7 +1113,7 @@ under the License. <profile> <id>jboss-it</id> - + <dependencies> <dependency> <groupId>com.h2database</groupId> @@ -1134,7 +1134,46 @@ under the License. <skipTests>true</skipTests> </configuration> </plugin> - + + <!-- Disable MANIFEST.MF OSGi handling --> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <executions> + <execution> + <id>bundle-manifest</id> + <phase>none</phase> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <inherited>true</inherited> + <executions> + <execution> + <id>setupBuildToolsForJBoss</id> + <phase>pre-integration-test</phase> + <configuration> + <target> + <unzip src="${settings.localRepository}/org/apache/syncope/syncope-build-tools/${project.version}/syncope-build-tools-${project.version}.war" + dest="${project.build.directory}/syncope-build-tools-test"/> + <copy file="${project.build.outputDirectory}/META-INF/MANIFEST.MF" + todir="${project.build.directory}/syncope-build-tools-test/META-INF" + overwrite="true"/> + <copy file="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar" + todir="${project.build.directory}/syncope-build-tools-test/WEB-INF/lib" + overwrite="true"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> @@ -1155,7 +1194,31 @@ under the License. <cargo.jvmargs>-Xms1024m -Xmx2048m -XX:PermSize=512m -XX:MaxPermSize=1024m -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled -XX:+CMSClassUnloadingEnabled</cargo.jvmargs> </properties> </configuration> - </configuration> + <deployables> + <deployable> + <location>${cargo.run.dir}</location> + <pingURL>http://localhost:${cargo.servlet.port}/syncope/rest/schema/user/list.xml</pingURL> + <pingTimeout>1200000</pingTimeout> + <properties> + <context>syncope</context> + </properties> + </deployable> + <deployable> + <groupId>org.connid.bundles.soap</groupId> + <artifactId>wssample</artifactId> + <type>war</type> + <properties> + <context>wssample</context> + </properties> + </deployable> + <deployable> + <location>${project.build.directory}/syncope-build-tools-test</location> + <properties> + <context>syncope-build-tools</context> + </properties> + </deployable> + </deployables> + </configuration> </plugin> </plugins> @@ -1171,9 +1234,6 @@ under the License. <resource> <directory>src/test/resources/jboss</directory> <filtering>true</filtering> - <includes> - <include>persistenceContextEMFactory.xml</include> - </includes> </resource> <resource> <directory>src/test/resources</directory> Added: syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF?rev=1456601&view=auto ============================================================================== --- syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF (added) +++ syncope/trunk/core/src/test/resources/jboss/META-INF/MANIFEST.MF Thu Mar 14 18:29:59 2013 @@ -0,0 +1,6 @@ +Manifest-Version: 1.0 +Built-By: developer +Build-Jdk: ${java.version} +Created-By: Apache Maven 3.0.4 +Archiver-Version: Plexus Archiver + Modified: syncope/trunk/pom.xml URL: http://svn.apache.org/viewvc/syncope/trunk/pom.xml?rev=1456601&r1=1456600&r2=1456601&view=diff ============================================================================== --- syncope/trunk/pom.xml (original) +++ syncope/trunk/pom.xml Thu Mar 14 18:29:59 2013 @@ -1160,6 +1160,7 @@ under the License. <exclude>nbactions.xml</exclude> <exclude>nb-configuration.xml</exclude> <exclude>**/META-INF/services/**</exclude> + <exclude>**/META-INF/MANIFEST.MF</exclude> <exclude>**/*.css</exclude> <exclude>**/*.js</exclude> <exclude>**/*.csv</exclude>