r73 - in trunk: . choreg choreg-admin-webapp choreg-admin-webapp/src/main/java/org/chorem/choreg/admin choreg-test-webapp chorem-commons oasis-ciq-api
Author: tchemit Date: 2010-11-22 09:40:59 +0100 (Mon, 22 Nov 2010) New Revision: 73 Url: http://chorem.org/repositories/revision/choreg/73 Log: reformat poms optimize dependencies add serialVersionUID clean poms Modified: trunk/choreg-admin-webapp/pom.xml trunk/choreg-admin-webapp/src/main/java/org/chorem/choreg/admin/ViewServices.java trunk/choreg-test-webapp/pom.xml trunk/choreg/pom.xml trunk/chorem-commons/pom.xml trunk/oasis-ciq-api/pom.xml trunk/pom.xml Modified: trunk/choreg/pom.xml =================================================================== --- trunk/choreg/pom.xml 2010-11-21 14:32:25 UTC (rev 72) +++ trunk/choreg/pom.xml 2010-11-22 08:40:59 UTC (rev 73) @@ -1,103 +1,80 @@ <?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> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.chorem</groupId> - <artifactId>choreg</artifactId> - <version>1.0.0-alpha-2-SNAPSHOT</version> - </parent> - - <groupId>org.chorem.choreg</groupId> + <parent> + <groupId>org.chorem</groupId> <artifactId>choreg</artifactId> + <version>1.0.0-alpha-2-SNAPSHOT</version> + </parent> - <dependencies> - <!-- Topia : Use for Interface Generation --> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - </dependencies> + <groupId>org.chorem.choreg</groupId> + <artifactId>choreg</artifactId> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>ChoReg</name> - <description>Chorem Registry</description> - <inceptionYear>2009</inceptionYear> + <name>ChoReg :: ChoReg Registry</name> + <description>Chorem Registry</description> + <inceptionYear>2009</inceptionYear> - <!-- Developpers, contributors... --> - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>fdesbois@codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - </developers> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <build> + <resources> + <resource> + <directory>src/main/resources/</directory> + <includes> + <include>*.*</include> + </includes> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <version>${eugenePluginVersion}</version> + <executions> + <execution> + <phase>generate-sources</phase> + <!--Configuration of model generator--> + <configuration> + <includes>**/*.objectmodel</includes> + <templates> + org.nuiton.topia.generator.InterfaceGenerator + </templates> + <defaultPackage>org.chorem</defaultPackage> + <fullPackagePath>org.chorem</fullPackagePath> + <extractedPackages>org.chorem</extractedPackages> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> - <packaging>jar</packaging> - - <build> - <resources> - <resource> - <directory>src/main/resources/</directory> - <includes> - <include>*.*</include> - </includes> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <version>${generator.version}</version> - <executions> - <execution> - <phase>generate-sources</phase> - <!--Configuration of model generator--> - <configuration> - <addCompileDirectory>true</addCompileDirectory> - <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.InterfaceGenerator</templates> - <defaultPackage>org.chorem</defaultPackage> - <fullPackagePath>org.chorem</fullPackagePath> - <extractedPackages>org.chorem</extractedPackages> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - </project> Modified: trunk/choreg-admin-webapp/pom.xml =================================================================== --- trunk/choreg-admin-webapp/pom.xml 2010-11-21 14:32:25 UTC (rev 72) +++ trunk/choreg-admin-webapp/pom.xml 2010-11-22 08:40:59 UTC (rev 73) @@ -1,75 +1,58 @@ <?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> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.chorem</groupId> - <artifactId>choreg</artifactId> - <version>1.0.0-alpha-2-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>choreg</artifactId> + <version>1.0.0-alpha-2-SNAPSHOT</version> + </parent> - <groupId>org.chorem.choreg</groupId> - <artifactId>choreg-admin-webapp</artifactId> + <groupId>org.chorem.choreg</groupId> + <artifactId>choreg-admin-webapp</artifactId> - <dependencies> - <dependency> - <groupId>org.chorem.choreg</groupId> - <artifactId>choreg</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.chorem</groupId> - <artifactId>oasis-ciq-api</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.chorem.choreg</groupId> + <artifactId>choreg</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.chorem</groupId> + <artifactId>oasis-ciq-api</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>ChoReg Admin WebApp</name> - <description>Administration web application for ChoReg</description> - <inceptionYear>2009</inceptionYear> + <name>ChoReg :: Admin WebApp</name> + <description>Administration web application for ChoReg</description> + <inceptionYear>2009</inceptionYear> - <!-- Developpers, contributors... --> - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>fdesbois@codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - </developers> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>war</packaging> - <properties> - <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> - </properties> + <packaging>war</packaging> + <properties> + <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> + </properties> </project> Modified: trunk/choreg-admin-webapp/src/main/java/org/chorem/choreg/admin/ViewServices.java =================================================================== --- trunk/choreg-admin-webapp/src/main/java/org/chorem/choreg/admin/ViewServices.java 2010-11-21 14:32:25 UTC (rev 72) +++ trunk/choreg-admin-webapp/src/main/java/org/chorem/choreg/admin/ViewServices.java 2010-11-22 08:40:59 UTC (rev 73) @@ -19,26 +19,16 @@ package org.chorem.choreg.admin; -import java.io.IOException; -import java.io.InputStream; -import java.io.PrintWriter; -import java.util.List; -import java.util.Map; +import org.chorem.choreg.AdminChoreg; + import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.apache.xmlbeans.XmlException; -import org.chorem.choreg.AdminChoreg; -import org.chorem.choreg.exceptions.ChoregException; -import org.chorem.choreg.ChoremConvert; -import org.chorem.choreg.ChoremRegistry; -import org.chorem.choreg.ChoremRegistryImpl; -import org.chorem.choreg.FormatType; -import org.chorem.oasis.ciq.api.SimplifiedNameElement; -import org.chorem.oasis.ciq.api.XNLHelper; -import urn.oasis.names.tc.ciq.xnl.PartyNameType; -import urn.oasis.names.tc.ciq.xpil.PartyDocument; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.List; +import java.util.Map; /** * ViewServices.java @@ -52,7 +42,8 @@ * by : $Author: fdesbois $ */ public class ViewServices extends HttpServlet { - + private static final long serialVersionUID = 1L; + /** * Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods. * @param request servlet request Modified: trunk/choreg-test-webapp/pom.xml =================================================================== --- trunk/choreg-test-webapp/pom.xml 2010-11-21 14:32:25 UTC (rev 72) +++ trunk/choreg-test-webapp/pom.xml 2010-11-22 08:40:59 UTC (rev 73) @@ -1,74 +1,60 @@ <?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> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.chorem</groupId> - <artifactId>choreg</artifactId> - <version>1.0.0-alpha-2-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.chorem</groupId> + <artifactId>choreg</artifactId> + <version>1.0.0-alpha-2-SNAPSHOT</version> + </parent> - <groupId>org.chorem.choreg</groupId> - <artifactId>choreg-test-webapp</artifactId> + <groupId>org.chorem.choreg</groupId> + <artifactId>choreg-test-webapp</artifactId> - <dependencies> - <dependency> - <groupId>org.chorem.choreg</groupId> - <artifactId>choreg</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.chorem</groupId> - <artifactId>oasis-ciq-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>org.chorem.choreg</groupId> + <artifactId>choreg</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.chorem</groupId> + <artifactId>oasis-ciq-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + </dependencies> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <name>ChoReg Test WebApp</name> - <description>Test web application with ChoremRegistry usage</description> - <inceptionYear>2009</inceptionYear> + <name>ChoReg :: Test WebApp</name> + <description>Test web application with ChoremRegistry usage</description> + <inceptionYear>2009</inceptionYear> - <!-- Developpers, contributors... --> - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>fdesbois@codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - </developers> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>war</packaging> - <properties> - <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> - </properties> + <packaging>war</packaging> + <properties> + <netbeans.hint.deploy.server>Tomcat60</netbeans.hint.deploy.server> + </properties> </project> Modified: trunk/chorem-commons/pom.xml =================================================================== --- trunk/chorem-commons/pom.xml 2010-11-21 14:32:25 UTC (rev 72) +++ trunk/chorem-commons/pom.xml 2010-11-22 08:40:59 UTC (rev 73) @@ -1,74 +1,63 @@ <?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> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.chorem</groupId> - <artifactId>choreg</artifactId> - <version>1.0.0-alpha-2-SNAPSHOT</version> - </parent> - + <parent> <groupId>org.chorem</groupId> - <artifactId>chorem-commons</artifactId> + <artifactId>choreg</artifactId> + <version>1.0.0-alpha-2-SNAPSHOT</version> + </parent> - <dependencies> - <dependency> - <groupId>org.chorem.choreg</groupId> - <artifactId>choreg</artifactId> - <version>${project.version}</version> - <scope>provided</scope> - </dependency> - <!-- Topia --> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - </dependencies> + <groupId>org.chorem</groupId> + <artifactId>chorem-commons</artifactId> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <dependencies> + <dependency> + <groupId>org.chorem.choreg</groupId> + <artifactId>choreg</artifactId> + <version>${project.version}</version> + <scope>provided</scope> + </dependency> - <name>Chorem-Commons</name> - <description>Partie commune de Chorem</description> - <inceptionYear>2009</inceptionYear> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <!-- Developpers, contributors... --> - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>fdesbois@codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - </developers> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <packaging>jar</packaging> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + </dependencies> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>Choreg :: Chorem-Commons</name> + <description>Partie commune de Chorem</description> + <inceptionYear>2009</inceptionYear> + </project> Modified: trunk/oasis-ciq-api/pom.xml =================================================================== --- trunk/oasis-ciq-api/pom.xml 2010-11-21 14:32:25 UTC (rev 72) +++ trunk/oasis-ciq-api/pom.xml 2010-11-22 08:40:59 UTC (rev 73) @@ -1,77 +1,67 @@ <?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> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> - <groupId>org.chorem</groupId> - <artifactId>choreg</artifactId> - <version>1.0.0-alpha-2-SNAPSHOT</version> - </parent> - + <parent> <groupId>org.chorem</groupId> - <artifactId>oasis-ciq-api</artifactId> + <artifactId>choreg</artifactId> + <version>1.0.0-alpha-2-SNAPSHOT</version> + </parent> - <dependencies> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - </dependency> - </dependencies> + <groupId>org.chorem</groupId> + <artifactId>oasis-ciq-api</artifactId> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <dependencies> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + </dependency> - <name>Oasis CIQ Api</name> - <description>Api with XMLBeans for standard OASIS Customer Information Quality (CIQ) TC </description> - <inceptionYear>2009</inceptionYear> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </dependency> + </dependencies> - <!-- Developpers, contributors... --> - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>fdesbois@codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Analyste</role> - <role>Développeur</role> - </roles> - </developer> - </developers> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <name>Choreg :: Oasis CIQ Api</name> + <description>Api with XMLBeans for standard OASIS Customer Information Quality + (CIQ) TC + </description> + <inceptionYear>2009</inceptionYear> - <packaging>jar</packaging> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <build> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>xmlbeans-maven-plugin</artifactId> - <version>2.3.2</version> - <executions> - <execution> - <goals> - <goal>xmlbeans</goal> - </goals> - </execution> - </executions> - <inherited>true</inherited> - <configuration> - <schemaDirectory>src/main/xsd</schemaDirectory> - </configuration> - </plugin> - </plugins> - </build> + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xmlbeans-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>xmlbeans</goal> + </goals> + </execution> + </executions> + <inherited>true</inherited> + <configuration> + <schemaDirectory>src/main/xsd</schemaDirectory> + </configuration> + </plugin> + </plugins> + </build> </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-21 14:32:25 UTC (rev 72) +++ trunk/pom.xml 2010-11-22 08:40:59 UTC (rev 73) @@ -1,200 +1,212 @@ <?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"> - <modelVersion>4.0.0</modelVersion> +<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> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.4.1</version> + </parent> + + <groupId>org.chorem</groupId> + <artifactId>choreg</artifactId> + <version>1.0.0-alpha-2-SNAPSHOT</version> + + <modules> + <module>chorem-commons</module> + <module>oasis-ciq-api</module> + <module>choreg</module> + <module>choreg-test-webapp</module> + <module>choreg-admin-webapp</module> + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.4.1</version> - </parent> + <artifactId>nuiton-utils</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${topiaVersion}</version> + </dependency> - <groupId>org.chorem</groupId> - <artifactId>choreg</artifactId> - <version>1.0.0-alpha-2-SNAPSHOT</version> + <dependency> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + <version>1.0.1</version> + </dependency> - <modules> - <module>chorem-commons</module> - <module>oasis-ciq-api</module> - <module>choreg</module> - <module>choreg-test-webapp</module> - <module>choreg-admin-webapp</module> - </modules> + <dependency> + <groupId>org.apache.xmlbeans</groupId> + <artifactId>xmlbeans</artifactId> + <version>2.4.0</version> + </dependency> + + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + </dependencies> + </dependencyManagement> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - <version>${topia.version}</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>${lang.version}</version> - </dependency> - <dependency> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>2.4.0</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - </dependencies> - </dependencyManagement> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <name>ChoReg</name> + <description>Registry for Chorem applications</description> + <inceptionYear>2009</inceptionYear> - <name>ChoReg</name> - <description>Registry for Chorem applications</description> - <inceptionYear>2009</inceptionYear> + <!-- Developpers, contributors... --> + <developers> + <developer> + <id>fdesbois</id> + <name>Florian DESBOIS</name> + <email>fdesbois@codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>Concepteur</role> + <role>Développeur</role> + </roles> + </developer> - <licenses> - <license> - <name>General Public License (GPL)</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> + <developer> + <id>tchemit</id> + <name>Tony Chemit</name> + <email>tchemit@codelutin.com</email> + <organization>Code Lutin</organization> + <organizationUrl>http://www.codelutin.com/</organizationUrl> + <timezone>+1</timezone> + <roles> + <role>developer</role> + </roles> + </developer> + </developers> - <!-- Developpers, contributors... --> - <developers> - <developer> - <id>fdesbois</id> - <name>Florian DESBOIS</name> - <email>fdesbois@codelutin.com</email> - <organization>Code Lutin</organization> - <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> - <roles> - <role>Concepteur</role> - <role>Développeur</role> - </roles> - </developer> - </developers> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <packaging>pom</packaging> - <packaging>pom</packaging> + <properties> + <platform>chorem.org</platform> + <projectId>choreg</projectId> - <properties> - <platform>chorem.org</platform> - <projectId>choreg</projectId> - <!-- Nuiton librairies --> - <topia.version>2.2.0</topia.version> - <generator.version>1.0.0</generator.version> + <!-- Nuiton librairies --> + <topiaVersion>2.2.0</topiaVersion> + <eugenePluginVersion>1.0.0</eugenePluginVersion> - <!-- commons-lang for ToPIA --> - <lang.version>2.4</lang.version> + <!-- license to use --> + <license.licenseName>gpl_v3</license.licenseName> - <!-- test --> - <junit.version>4.7</junit.version> + </properties> - <!-- license to use --> - <license.licenseName>gpl_v3</license.licenseName> + <build> + <defaultGoal>install</defaultGoal> + <pluginManagement> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.nuiton.jrst</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrstPluginVersion}</version> + </dependency> + </dependencies> + </plugin> - </properties> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>xmlbeans-maven-plugin</artifactId> + <version>2.3.2</version> + </plugin> - <build> - <defaultGoal>install</defaultGoal> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.jrst</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </pluginManagement> - </build> + </plugins> + </pluginManagement> + </build> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - <scm> - <connection>scm:svn:http://svn.chorem.org/svn/choreg/trunk</connection> - <developerConnection>scm:svn:svn+ssh://publish@svn.chorem.org/var/lib/svn/svn-chorem/choreg/trunk - </developerConnection> - <url>http://www.chorem.org/repositories/browse/choreg/trunk</url> - </scm> + <scm> + <connection>scm:svn:http://svn.chorem.org/svn/choreg/trunk</connection> + <developerConnection> + scm:svn:svn+ssh://publish@svn.chorem.org/var/lib/svn/svn-chorem/choreg/trunk + </developerConnection> + <url>http://www.chorem.org/repositories/browse/choreg/trunk</url> + </scm> - <repositories> - <!-- depot des releases nuiton --> - <repository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <checksumPolicy>warn</checksumPolicy> - </releases> - </repository> + <repositories> + <!-- depot des releases nuiton --> + <repository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> - <!-- depot des snapshots nuiton --> - <repository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </repository> - </repositories> + <!-- depot des snapshots nuiton --> + <repository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </repository> + </repositories> - <pluginRepositories> - <!-- depot des releases nuiton --> - <pluginRepository> - <id>nuiton.release</id> - <name>NuitonReleaseRepository</name> - <url>http://maven.nuiton.org/release</url> - <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <checksumPolicy>warn</checksumPolicy> - </releases> - </pluginRepository> + <pluginRepositories> + <!-- depot des releases nuiton --> + <pluginRepository> + <id>nuiton.release</id> + <name>NuitonReleaseRepository</name> + <url>http://maven.nuiton.org/release</url> + <snapshots> + <enabled>false</enabled> + </snapshots> + <releases> + <checksumPolicy>warn</checksumPolicy> + </releases> + </pluginRepository> - <!-- depot des snapshots nuiton --> - <pluginRepository> - <id>nuiton.snapshot</id> - <name>NuitonSnapshotRepository</name> - <url>http://maven.nuiton.org/snapshot</url> - <snapshots> - <checksumPolicy>fail</checksumPolicy> - </snapshots> - <releases> - <enabled>false</enabled> - </releases> - </pluginRepository> - </pluginRepositories> + <!-- depot des snapshots nuiton --> + <pluginRepository> + <id>nuiton.snapshot</id> + <name>NuitonSnapshotRepository</name> + <url>http://maven.nuiton.org/snapshot</url> + <snapshots> + <checksumPolicy>fail</checksumPolicy> + </snapshots> + <releases> + <enabled>false</enabled> + </releases> + </pluginRepository> + </pluginRepositories> </project>
participants (1)
-
tchemit＠users.chorem.org