You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/02/24 11:03:15 UTC

svn commit: r1293154 - in /incubator/syncope/trunk/archetype/src/main/resources/archetype-resources: console/pom.xml core/pom.xml pom.xml

Author: ilgrosso
Date: Fri Feb 24 10:03:15 2012
New Revision: 1293154

URL: http://svn.apache.org/viewvc?rev=1293154&view=rev
Log:
Fixing archetype POM models

Modified:
    incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
    incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
    incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml

Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1293154&r1=1293153&r2=1293154&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml (original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml Fri Feb 24 10:03:15 2012
@@ -18,251 +18,251 @@ specific language governing permissions 
 under the License.
 
 -->
-

-<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/xsd/maven-4.0.0.xsd">


-


-    <modelVersion>4.0.0</modelVersion>


-


-    <parent>


-        <groupId>${groupId}</groupId>


-        <artifactId>${rootArtifactId}</artifactId>


-        <version>${version}</version>


-    </parent>


-


-    <name>Syncope sample project console</name>


-    <groupId>${groupId}</groupId>


-    <artifactId>${artifactId}</artifactId>


-    <packaging>war</packaging>


-


-    <dependencies>


-


-        <dependency>


-            <groupId>org.apache.wicket</groupId>


-            <artifactId>wicket</artifactId>


-            <type>pom</type>


-        </dependency>


-


-        <dependency>


-            <groupId>org.apache.wicket</groupId>


-            <artifactId>wicket-extensions</artifactId>


-        </dependency>


-


-        <dependency>


-            <groupId>org.apache.wicket</groupId>


-            <artifactId>wicket-spring</artifactId>


-        </dependency>


-


-        <dependency>


-            <groupId>org.apache.syncope</groupId>


-            <artifactId>syncope-client</artifactId>


-        </dependency>


-        <dependency>


-            <groupId>org.apache.syncope</groupId>


-            <artifactId>syncope-console</artifactId>


-            <type>war</type>


-        </dependency>


-        <dependency>


-            <groupId>org.apache.syncope</groupId>


-            <artifactId>syncope-console</artifactId>


-            <classifier>classes</classifier>


-        </dependency>


-


-        <dependency>


-            <groupId>org.springframework</groupId>


-            <artifactId>spring-webmvc</artifactId>


-        </dependency>


-


-        <dependency>


-            <groupId>org.apache.wicket</groupId>


-            <artifactId>wicket-auth-roles</artifactId>


-            <type>jar</type>


-        </dependency>


-


-        <!-- TEST -->


-        <dependency>


-            <groupId>com.h2database</groupId>


-            <artifactId>h2</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles.soap</groupId>


-            <artifactId>org.connid.bundles.soap</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles.soap</groupId>


-            <artifactId>wssample</artifactId>


-            <type>war</type>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles.db</groupId>


-            <artifactId>org.connid.bundles.db.table</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles</groupId>


-            <artifactId>org.connid.bundles.csvdir</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles</groupId>


-            <artifactId>org.connid.bundles.ldap</artifactId>


-            <scope>test</scope>


-        </dependency>


-        


-        <dependency>


-            <groupId>org.apache.syncope</groupId>


-            <artifactId>syncope-build-tools</artifactId>


-            <type>war</type>


-            <scope>test</scope>


-        </dependency>


-        <!-- /TEST -->


-        


-    </dependencies>


-


-    <build>


-        <finalName>syncope-console</finalName>


-


-        <plugins>


-


-            <plugin>


-                <groupId>org.apache.maven.plugins</groupId>


-                <artifactId>maven-dependency-plugin</artifactId>


-                <inherited>true</inherited>


-                <executions>


-                    <execution>


-                        <id>set-bundles</id>


-                        <phase>process-test-resources</phase>


-                        <goals>


-                            <goal>copy</goal>


-                        </goals>


-                    </execution>


-                </executions>


-            </plugin>


-            


-            <plugin>


-                <groupId>org.apache.maven.plugins</groupId>


-                <artifactId>maven-antrun-plugin</artifactId>


-                <inherited>true</inherited>


-                <executions>


-                    <execution>


-                        <id>explodeSyncopeWAR</id>


-                        <phase>pre-integration-test</phase>


-                        <configuration>


-                            <target>


-                                <unzip src="${basedir}/../core/target/syncope.war" dest="${cargo.run.dir}">


-                                    <patternset>


-                                        <exclude name="**/content.xml" />


-                                        <exclude name="**/persistence.properties" />


-                                        <exclude name="**/security.properties" />


-                                        <exclude name="**/workflow.properties" />


-                                    </patternset>


-                                </unzip>


-                                <copy file="${project.build.directory}/test-classes/db.jsp" todir="${cargo.run.dir}"/>


-                                <copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">


-                                    <fileset dir="${project.build.directory}/test-classes"/>


-                                </copy>


-                            </target>


-                        </configuration>


-                        <goals>


-                            <goal>run</goal>


-                        </goals>


-                    </execution>


-                    <execution>


-                        <id>setupCSV</id>


-                        <phase>pre-integration-test</phase>


-                        <configuration>


-                            <target>


-                                <copy file="${project.build.directory}/test-classes/test.csv" todir="${java.io.tmpdir}" overwrite="true"/>


-                            </target>    


-                        </configuration>


-                        <goals>


-                            <goal>run</goal>


-                        </goals>


-                    </execution>


-                </executions>


-            </plugin>


-


-            <plugin>


-                <groupId>org.codehaus.cargo</groupId>


-                <artifactId>cargo-maven2-plugin</artifactId>


-                <inherited>true</inherited>


-                <configuration>


-                    <container>


-                        <dependencies>


-                            <dependency>


-                                <groupId>com.h2database</groupId>


-                                <artifactId>h2</artifactId>


-                            </dependency>


-                        </dependencies>


-                    </container>


-                    <configuration>


-                        <type>standalone</type>


-                        <properties>


-                            <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>


-                            <cargo.jvmargs>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs>


-                        </properties>


-                        <deployables>


-                            <deployable>


-                                <location>${cargo.run.dir}</location>


-                                <properties>


-                                    <context>syncope</context>


-                                </properties>


-                            </deployable>


-                            <deployable>


-                                <location>${project.build.directory}/${project.build.finalName}.war</location>


-                                <properties>


-                                    <context>syncope-console</context>


-                                </properties>


-                            </deployable>


-                            <deployable>


-                                <location>${settings.localRepository}/org/syncope/syncope-build-tools/${syncope.version}/syncope-build-tools-${syncope.version}.war</location>


-                                <properties>


-                                    <context>syncope-build-tools</context>


-                                </properties>


-                            </deployable>


-                            <deployable>


-                                <location>${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war</location>


-                                <properties>


-                                    <context>wssample</context>


-                                </properties>


-                            </deployable>


-                        </deployables>


-                    </configuration>


-                </configuration>


-            </plugin>


-            


-        </plugins>


-


-        <resources>


-            <resource>


-                <directory>src/main/resources</directory>


-                <filtering>true</filtering>


-            </resource>


-        </resources>


-


-        <testResources>


-            <testResource>


-                <directory>src/test/resources</directory>


-                <filtering>true</filtering>


-            </testResource>


-            <testResource>


-                <directory>../core/src/test/resources</directory>


-                <filtering>true</filtering>


-            </testResource>


-        </testResources>


-    </build>


-    


-    <profiles>


-        <profile>


-            <id>embedded</id>


-            <properties>


-                <maven.test.skip>true</maven.test.skip>


-            </properties>


-            <build>


-                <defaultGoal>clean verify cargo:run</defaultGoal>    


-            </build>


-        </profile>    


-    </profiles>


-</project>


+
+<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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>${groupId}</groupId>
+        <artifactId>${rootArtifactId}</artifactId>
+        <version>${version}</version>
+    </parent>
+
+    <name>Apache Syncope sample project console</name>
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <packaging>war</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket</artifactId>
+            <type>pom</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-extensions</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-spring</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.syncope</groupId>
+            <artifactId>syncope-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.syncope</groupId>
+            <artifactId>syncope-console</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.syncope</groupId>
+            <artifactId>syncope-console</artifactId>
+            <classifier>classes</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.wicket</groupId>
+            <artifactId>wicket-auth-roles</artifactId>
+            <type>jar</type>
+        </dependency>
+
+        <!-- TEST -->
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles.soap</groupId>
+            <artifactId>org.connid.bundles.soap</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles.soap</groupId>
+            <artifactId>wssample</artifactId>
+            <type>war</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles.db</groupId>
+            <artifactId>org.connid.bundles.db.table</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles</groupId>
+            <artifactId>org.connid.bundles.csvdir</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles</groupId>
+            <artifactId>org.connid.bundles.ldap</artifactId>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.syncope</groupId>
+            <artifactId>syncope-build-tools</artifactId>
+            <type>war</type>
+            <scope>test</scope>
+        </dependency>
+        <!-- /TEST -->
+        
+    </dependencies>
+
+    <build>
+        <finalName>syncope-console</finalName>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <inherited>true</inherited>
+                <executions>
+                    <execution>
+                        <id>set-bundles</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <inherited>true</inherited>
+                <executions>
+                    <execution>
+                        <id>explodeSyncopeWAR</id>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <target>
+                                <unzip src="${basedir}/../core/target/syncope.war" dest="${cargo.run.dir}">
+                                    <patternset>
+                                        <exclude name="**/content.xml" />
+                                        <exclude name="**/persistence.properties" />
+                                        <exclude name="**/security.properties" />
+                                        <exclude name="**/workflow.properties" />
+                                    </patternset>
+                                </unzip>
+                                <copy file="${project.build.directory}/test-classes/db.jsp" todir="${cargo.run.dir}"/>
+                                <copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">
+                                    <fileset dir="${project.build.directory}/test-classes"/>
+                                </copy>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>setupCSV</id>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <target>
+                                <copy file="${project.build.directory}/test-classes/test.csv" todir="${java.io.tmpdir}" overwrite="true"/>
+                            </target>    
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <container>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.h2database</groupId>
+                                <artifactId>h2</artifactId>
+                            </dependency>
+                        </dependencies>
+                    </container>
+                    <configuration>
+                        <type>standalone</type>
+                        <properties>
+                            <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
+                            <cargo.jvmargs>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs>
+                        </properties>
+                        <deployables>
+                            <deployable>
+                                <location>${cargo.run.dir}</location>
+                                <properties>
+                                    <context>syncope</context>
+                                </properties>
+                            </deployable>
+                            <deployable>
+                                <location>${project.build.directory}/${project.build.finalName}.war</location>
+                                <properties>
+                                    <context>syncope-console</context>
+                                </properties>
+                            </deployable>
+                            <deployable>
+                                <location>${settings.localRepository}/org/syncope/syncope-build-tools/${syncope.version}/syncope-build-tools-${syncope.version}.war</location>
+                                <properties>
+                                    <context>syncope-build-tools</context>
+                                </properties>
+                            </deployable>
+                            <deployable>
+                                <location>${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war</location>
+                                <properties>
+                                    <context>wssample</context>
+                                </properties>
+                            </deployable>
+                        </deployables>
+                    </configuration>
+                </configuration>
+            </plugin>
+            
+        </plugins>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+            <testResource>
+                <directory>../core/src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+    </build>
+    
+    <profiles>
+        <profile>
+            <id>embedded</id>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+            <build>
+                <defaultGoal>clean verify cargo:run</defaultGoal>    
+            </build>
+        </profile>    
+    </profiles>
+</project>

Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml?rev=1293154&r1=1293153&r2=1293154&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml (original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml Fri Feb 24 10:03:15 2012
@@ -18,314 +18,314 @@ specific language governing permissions 
 under the License.
 
 -->
-

-<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/xsd/maven-4.0.0.xsd">


-


-    <modelVersion>4.0.0</modelVersion>


-


-    <parent>


-        <groupId>${groupId}</groupId>


-        <artifactId>${rootArtifactId}</artifactId>


-        <version>${version}</version>


-    </parent>


-


-    <name>Syncope sample project core</name>


-    <groupId>${groupId}</groupId>


-    <artifactId>${artifactId}</artifactId>


-    <packaging>war</packaging>


-


-    <dependencies>


-


-        <dependency>


-            <groupId>org.apache.syncope</groupId>


-            <artifactId>syncope-client</artifactId>


-        </dependency>


-        <dependency>


-            <groupId>org.apache.syncope</groupId>


-            <artifactId>syncope-core</artifactId>


-            <type>war</type>


-        </dependency>


-        <dependency>


-            <groupId>org.apache.syncope</groupId>


-            <artifactId>syncope-core</artifactId>


-            <classifier>classes</classifier>


-        </dependency>


-


-        <dependency>


-            <groupId>javax.servlet</groupId>


-            <artifactId>servlet-api</artifactId>


-        </dependency>


-        <dependency>


-            <groupId>javax.servlet.jsp</groupId>


-            <artifactId>jsp-api</artifactId>


-        </dependency>


-        <dependency>


-            <groupId>javax.servlet</groupId>


-            <artifactId>jstl</artifactId>


-        </dependency>


-


-        <dependency>


-            <groupId>org.springframework.security</groupId>


-            <artifactId>spring-security-web</artifactId>


-        </dependency>


-        <dependency>


-            <groupId>org.springframework.security</groupId>


-            <artifactId>spring-security-config</artifactId>


-        </dependency>


-


-        <dependency>


-            <groupId>org.apache.openjpa</groupId>


-            <artifactId>openjpa-all</artifactId>


-        </dependency>


-


-        <dependency>


-            <groupId>org.codehaus.groovy</groupId>


-            <artifactId>groovy-all</artifactId>


-        </dependency>


-


-        <!-- TEST -->


-        <dependency>


-            <groupId>junit</groupId>


-            <artifactId>junit</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.springframework</groupId>


-            <artifactId>spring-test</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>com.h2database</groupId>


-            <artifactId>h2</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles.soap</groupId>


-            <artifactId>org.connid.bundles.soap</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles.soap</groupId>


-            <artifactId>wssample</artifactId>


-            <type>war</type>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles.db</groupId>


-            <artifactId>org.connid.bundles.db.table</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles</groupId>


-            <artifactId>org.connid.bundles.csvdir</artifactId>


-            <scope>test</scope>


-        </dependency>


-        <dependency>


-            <groupId>org.connid.bundles</groupId>


-            <artifactId>org.connid.bundles.ldap</artifactId>


-            <scope>test</scope>


-        </dependency>


-            


-        <dependency>


-            <groupId>org.apache.syncope</groupId>


-            <artifactId>syncope-build-tools</artifactId>


-            <type>war</type>


-            <scope>test</scope>


-        </dependency>


-        <!-- /TEST -->


-


-    </dependencies>


-


-    <build>


-        <finalName>syncope</finalName>


-


-        <plugins>


-


-            <plugin>


-                <groupId>org.apache.maven.plugins</groupId>


-                <artifactId>maven-dependency-plugin</artifactId>


-                <inherited>true</inherited>


-                <executions>


-                    <execution>


-                        <id>set-bundles</id>


-                        <phase>process-test-resources</phase>


-                        <goals>


-                            <goal>copy</goal>


-                        </goals>


-                    </execution>


-                </executions>


-            </plugin>


-            


-            <plugin>


-                <groupId>org.apache.maven.plugins</groupId>


-                <artifactId>maven-failsafe-plugin</artifactId>


-                <inherited>true</inherited>


-                <configuration>


-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>


-                    <encoding>utf-8</encoding>


-                </configuration>


-                <executions>


-                    <execution>


-                        <id>verify</id>


-                        <goals>


-                            <goal>verify</goal>


-                        </goals>


-                    </execution>


-                </executions>


-            </plugin>


-


-            <plugin>


-                <groupId>org.apache.maven.plugins</groupId>


-                <artifactId>maven-antrun-plugin</artifactId>


-                <inherited>true</inherited>


-                <executions>


-                    <execution>


-                        <id>explodeSyncopeWAR</id>


-                        <phase>pre-integration-test</phase>


-                        <configuration>


-                            <target>


-                                <unzip src="${project.build.directory}/${project.build.finalName}.war"


-                                       dest="${cargo.run.dir}">


-                                    <patternset>


-                                        <exclude name="**/content.xml"/>


-                                        <exclude name="**/persistence.properties"/>


-                                        <exclude name="**/security.properties"/>


-                                        <exclude name="**/workflow.properties" />


-                                    </patternset>


-                                </unzip>


-                                <copy file="${project.build.directory}/test-classes/db.jsp" todir="${cargo.run.dir}"/>


-                                <copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">


-                                    <fileset dir="${project.build.directory}/test-classes"/>


-                                </copy>


-                            </target>


-                        </configuration>


-                        <goals>


-                            <goal>run</goal>


-                        </goals>


-                    </execution>


-                    <execution>


-                        <id>setupCSV</id>


-                        <phase>pre-integration-test</phase>


-                        <configuration>


-                            <target>


-                                <copy file="${project.build.directory}/test-classes/test.csv" todir="${java.io.tmpdir}" overwrite="true"/>


-                            </target>    


-                        </configuration>


-                        <goals>


-                            <goal>run</goal>


-                        </goals>


-                    </execution>


-                </executions>


-            </plugin>


-


-            <plugin>


-                <groupId>org.codehaus.cargo</groupId>


-                <artifactId>cargo-maven2-plugin</artifactId>


-                <inherited>true</inherited>


-                <configuration>


-                    <container>


-                        <dependencies>


-                            <dependency>


-                                <groupId>com.h2database</groupId>


-                                <artifactId>h2</artifactId>


-                            </dependency>


-                        </dependencies>


-                    </container>


-                    <configuration>


-                        <type>standalone</type>


-                        <properties>


-                            <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>


-                            <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=9009,server=y,suspend=n</cargo.jvmargs>-->


-                        </properties>


-                        <deployables>


-                            <deployable>


-                                <location>${cargo.run.dir}</location>


-                                <properties>


-                                    <context>syncope</context>


-                                </properties>


-                            </deployable>


-                            <deployable>


-                                <location>${settings.localRepository}/org/syncope/syncope-build-tools/${syncope.version}/syncope-build-tools-${syncope.version}.war</location>


-                                <properties>


-                                    <context>syncope-build-tools</context>


-                                </properties>


-                            </deployable>


-                            <deployable>


-                                <location>${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war</location>


-                                <properties>


-                                    <context>wssample</context>


-                                </properties>


-                            </deployable>


-                        </deployables>


-                    </configuration>


-                </configuration>


-                <executions>


-                    <execution>


-                        <id>start-container</id>


-                        <phase>pre-integration-test</phase>


-                        <goals>


-                            <goal>start</goal>


-                        </goals>


-                        <configuration>


-                            <wait>false</wait>


-                        </configuration>


-                    </execution>


-                    <execution>


-                        <id>stop-container</id>


-                        <phase>post-integration-test</phase>


-                        <goals>


-                            <goal>stop</goal>


-                        </goals>


-                    </execution>


-                </executions>


-            </plugin>


-            


-            <plugin>


-                <groupId>org.apache.openjpa</groupId>


-                <artifactId>openjpa-maven-plugin</artifactId>


-                <inherited>true</inherited>


-                <dependencies>


-                    <dependency>


-                        <groupId>com.h2database</groupId>


-                        <artifactId>h2</artifactId>


-                        <version>${h2.version}</version>


-                    </dependency>


-                </dependencies>


-                <configuration>


-                    <includes>org/syncope/core/persistence/beans/**/*.class</includes>


-                    <connectionDriverName>org.springframework.jdbc.datasource.DriverManagerDataSource</connectionDriverName>


-                    <connectionProperties>


-                        driverClassName=org.h2.Driver,


-                        url=jdbc:h2:mem:syncopedb


-                        username=sa,


-                        password=


-                    </connectionProperties>


-                </configuration>


-                <executions>


-                    <execution>


-                        <id>enhancer</id>


-                        <phase>process-classes</phase>


-                        <goals>


-                            <goal>enhance</goal>


-                        </goals>


-                    </execution>


-                </executions>


-            </plugin>


-


-        </plugins>


-


-        <resources>


-            <resource>


-                <directory>src/main/resources</directory>


-                <filtering>true</filtering>


-            </resource>


-        </resources>


-


-        <testResources>


-            <testResource>


-                <directory>src/test/resources</directory>


-                <filtering>true</filtering>


-            </testResource>


-        </testResources>


-    </build>


-</project>


+
+<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/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>${groupId}</groupId>
+        <artifactId>${rootArtifactId}</artifactId>
+        <version>${version}</version>
+    </parent>
+
+    <name>Syncope sample project core</name>
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <packaging>war</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.syncope</groupId>
+            <artifactId>syncope-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.syncope</groupId>
+            <artifactId>syncope-core</artifactId>
+            <type>war</type>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.syncope</groupId>
+            <artifactId>syncope-core</artifactId>
+            <classifier>classes</classifier>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet.jsp</groupId>
+            <artifactId>jsp-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-config</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.openjpa</groupId>
+            <artifactId>openjpa-all</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-all</artifactId>
+        </dependency>
+
+        <!-- TEST -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles.soap</groupId>
+            <artifactId>org.connid.bundles.soap</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles.soap</groupId>
+            <artifactId>wssample</artifactId>
+            <type>war</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles.db</groupId>
+            <artifactId>org.connid.bundles.db.table</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles</groupId>
+            <artifactId>org.connid.bundles.csvdir</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.connid.bundles</groupId>
+            <artifactId>org.connid.bundles.ldap</artifactId>
+            <scope>test</scope>
+        </dependency>
+            
+        <dependency>
+            <groupId>org.apache.syncope</groupId>
+            <artifactId>syncope-build-tools</artifactId>
+            <type>war</type>
+            <scope>test</scope>
+        </dependency>
+        <!-- /TEST -->
+
+    </dependencies>
+
+    <build>
+        <finalName>syncope</finalName>
+
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <inherited>true</inherited>
+                <executions>
+                    <execution>
+                        <id>set-bundles</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                    <encoding>utf-8</encoding>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>verify</id>
+                        <goals>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <inherited>true</inherited>
+                <executions>
+                    <execution>
+                        <id>explodeSyncopeWAR</id>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <target>
+                                <unzip src="${project.build.directory}/${project.build.finalName}.war"
+                                       dest="${cargo.run.dir}">
+                                    <patternset>
+                                        <exclude name="**/content.xml"/>
+                                        <exclude name="**/persistence.properties"/>
+                                        <exclude name="**/security.properties"/>
+                                        <exclude name="**/workflow.properties" />
+                                    </patternset>
+                                </unzip>
+                                <copy file="${project.build.directory}/test-classes/db.jsp" todir="${cargo.run.dir}"/>
+                                <copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">
+                                    <fileset dir="${project.build.directory}/test-classes"/>
+                                </copy>
+                            </target>
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>setupCSV</id>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <target>
+                                <copy file="${project.build.directory}/test-classes/test.csv" todir="${java.io.tmpdir}" overwrite="true"/>
+                            </target>    
+                        </configuration>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <inherited>true</inherited>
+                <configuration>
+                    <container>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.h2database</groupId>
+                                <artifactId>h2</artifactId>
+                            </dependency>
+                        </dependencies>
+                    </container>
+                    <configuration>
+                        <type>standalone</type>
+                        <properties>
+                            <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>
+                            <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=9009,server=y,suspend=n</cargo.jvmargs>-->
+                        </properties>
+                        <deployables>
+                            <deployable>
+                                <location>${cargo.run.dir}</location>
+                                <properties>
+                                    <context>syncope</context>
+                                </properties>
+                            </deployable>
+                            <deployable>
+                                <location>${settings.localRepository}/org/syncope/syncope-build-tools/${syncope.version}/syncope-build-tools-${syncope.version}.war</location>
+                                <properties>
+                                    <context>syncope-build-tools</context>
+                                </properties>
+                            </deployable>
+                            <deployable>
+                                <location>${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war</location>
+                                <properties>
+                                    <context>wssample</context>
+                                </properties>
+                            </deployable>
+                        </deployables>
+                    </configuration>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-container</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                        <configuration>
+                            <wait>false</wait>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop-container</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            
+            <plugin>
+                <groupId>org.apache.openjpa</groupId>
+                <artifactId>openjpa-maven-plugin</artifactId>
+                <inherited>true</inherited>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.h2database</groupId>
+                        <artifactId>h2</artifactId>
+                        <version>${h2.version}</version>
+                    </dependency>
+                </dependencies>
+                <configuration>
+                    <includes>org/syncope/core/persistence/beans/**/*.class</includes>
+                    <connectionDriverName>org.springframework.jdbc.datasource.DriverManagerDataSource</connectionDriverName>
+                    <connectionProperties>
+                        driverClassName=org.h2.Driver,
+                        url=jdbc:h2:mem:syncopedb
+                        username=sa,
+                        password=
+                    </connectionProperties>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>enhancer</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>enhance</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
+        </plugins>
+
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <testResources>
+            <testResource>
+                <directory>src/test/resources</directory>
+                <filtering>true</filtering>
+            </testResource>
+        </testResources>
+    </build>
+</project>

Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml?rev=1293154&r1=1293153&r2=1293154&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml Fri Feb 24 10:03:15 2012
@@ -18,78 +18,78 @@ specific language governing permissions 
 under the License.
 
 -->
-

-<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>org.apache.syncope</groupId>


-        <artifactId>syncope</artifactId>


-        <version>1.0-SNAPSHOT</version>


-    </parent>


-


-    <properties>


-        <syncope.version>1.0-SNAPSHOT</syncope.version>


-    </properties>


-


-    <name>Syncope sample project</name>


-    <groupId>${groupId}</groupId>


-    <artifactId>${artifactId}</artifactId>


-    <version>${version}</version>


-    <packaging>pom</packaging>


-


-    <dependencyManagement>


-        <dependencies>


-            <dependency>


-                <groupId>org.apache.syncope</groupId>


-                <artifactId>syncope-client</artifactId>


-                <version>${syncope.version}</version>


-            </dependency> 


-


-            <dependency>


-                <groupId>org.apache.syncope</groupId>


-                <artifactId>syncope-build-tools</artifactId>


-                <version>${syncope.version}</version>


-                <type>war</type>


-            </dependency> 


-            


-            <dependency>


-                <groupId>org.apache.syncope</groupId>


-                <artifactId>syncope-core</artifactId>


-                <version>${syncope.version}</version>


-                <type>war</type>


-            </dependency> 


-            <dependency>


-                <groupId>org.apache.syncope</groupId>


-                <artifactId>syncope-core</artifactId>


-                <version>${syncope.version}</version>


-                <classifier>classes</classifier>


-                <scope>provided</scope>


-            </dependency> 


-


-            <dependency>


-                <groupId>org.apache.syncope</groupId>


-                <artifactId>syncope-console</artifactId>


-                <version>${syncope.version}</version>


-                <type>war</type>


-            </dependency> 


-            <dependency>


-                <groupId>org.apache.syncope</groupId>


-                <artifactId>syncope-console</artifactId>


-                <version>${syncope.version}</version>


-                <classifier>classes</classifier>


-                <scope>provided</scope>


-            </dependency> 


-        </dependencies>


-    </dependencyManagement>


-    


-    <modules>


-        <module>core</module>


-        <module>console</module>


-    </modules>


-


-</project>


+
+<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>org.apache.syncope</groupId>
+        <artifactId>syncope</artifactId>
+        <version>1.1-SNAPSHOT</version>
+    </parent>
+
+    <properties>
+        <syncope.version>1.1-SNAPSHOT</syncope.version>
+    </properties>
+
+    <name>Apache Syncope sample project</name>
+    <groupId>${groupId}</groupId>
+    <artifactId>${artifactId}</artifactId>
+    <version>${version}</version>
+    <packaging>pom</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.syncope</groupId>
+                <artifactId>syncope-client</artifactId>
+                <version>${syncope.version}</version>
+            </dependency> 
+
+            <dependency>
+                <groupId>org.apache.syncope</groupId>
+                <artifactId>syncope-build-tools</artifactId>
+                <version>${syncope.version}</version>
+                <type>war</type>
+            </dependency> 
+            
+            <dependency>
+                <groupId>org.apache.syncope</groupId>
+                <artifactId>syncope-core</artifactId>
+                <version>${syncope.version}</version>
+                <type>war</type>
+            </dependency> 
+            <dependency>
+                <groupId>org.apache.syncope</groupId>
+                <artifactId>syncope-core</artifactId>
+                <version>${syncope.version}</version>
+                <classifier>classes</classifier>
+                <scope>provided</scope>
+            </dependency> 
+
+            <dependency>
+                <groupId>org.apache.syncope</groupId>
+                <artifactId>syncope-console</artifactId>
+                <version>${syncope.version}</version>
+                <type>war</type>
+            </dependency> 
+            <dependency>
+                <groupId>org.apache.syncope</groupId>
+                <artifactId>syncope-console</artifactId>
+                <version>${syncope.version}</version>
+                <classifier>classes</classifier>
+                <scope>provided</scope>
+            </dependency> 
+        </dependencies>
+    </dependencyManagement>
+    
+    <modules>
+        <module>core</module>
+        <module>console</module>
+    </modules>
+
+</project>