Author: glandais Date: 2008-01-16 16:55:22 +0000 (Wed, 16 Jan 2008) New Revision: 167 Added: trunk/simexplorer-is-entities/profiles.xml trunk/simexplorer-is-service-ear/profiles.xml trunk/simexplorer-is-service/profiles.xml trunk/simexplorer-is-storage/profiles.xml trunk/simexplorer-is-web/profiles.xml Modified: trunk/simexplorer-is-service-ear/deploy.sh trunk/simexplorer-is-service-ear/pom.xml trunk/simexplorer-is-web/pom.xml trunk/simexplorer-is/pom.xml Log: Integration update Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-01-16 16:54:21 UTC (rev 166) +++ trunk/simexplorer-is/pom.xml 2008-01-16 16:55:22 UTC (rev 167) @@ -131,10 +131,11 @@ </dependencies> <modules> + <module>../simexplorer-is-security</module> <module>../simexplorer-is-entities</module> <module>../simexplorer-is-storage</module> <module>../simexplorer-is-service</module> <module>../simexplorer-is-web</module> - <module>../simexplorer-is-service-ear</module> + <module>../simexplorer-is-ear</module> </modules> </project> \ No newline at end of file Added: trunk/simexplorer-is-entities/profiles.xml =================================================================== --- trunk/simexplorer-is-entities/profiles.xml (rev 0) +++ trunk/simexplorer-is-entities/profiles.xml 2008-01-16 16:55:22 UTC (rev 167) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<settings> + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <!-- id du projet du labs (buix) --> + <labs.id>130</labs.id> + <!--Source base dir--> + <maven.src.dir>${basedir}/src</maven.src.dir> + <!--Test--> + <maven.test.skip>true</maven.test.skip> + <!--Compile with ?--> + <maven.compile.source>1.5</maven.compile.source> + <maven.compile.target>1.5</maven.compile.target> + <!--Main class in JAR + <maven.jar.main.class> + jaxx.compiler.JAXXCompiler + </maven.jar.main.class> + --> + </properties> + </profile> + </profiles> +</settings> \ No newline at end of file Added: trunk/simexplorer-is-service/profiles.xml =================================================================== --- trunk/simexplorer-is-service/profiles.xml (rev 0) +++ trunk/simexplorer-is-service/profiles.xml 2008-01-16 16:55:22 UTC (rev 167) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<settings> + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <!-- id du projet du labs (buix) --> + <labs.id>130</labs.id> + <!--Source base dir--> + <maven.src.dir>${basedir}/src</maven.src.dir> + <!--Test--> + <maven.test.skip>true</maven.test.skip> + <!--Compile with ?--> + <maven.compile.source>1.5</maven.compile.source> + <maven.compile.target>1.5</maven.compile.target> + <!--Main class in JAR + <maven.jar.main.class> + jaxx.compiler.JAXXCompiler + </maven.jar.main.class> + --> + </properties> + </profile> + </profiles> +</settings> \ No newline at end of file Modified: trunk/simexplorer-is-service-ear/deploy.sh =================================================================== --- trunk/simexplorer-is-service-ear/deploy.sh 2008-01-16 16:54:21 UTC (rev 166) +++ trunk/simexplorer-is-service-ear/deploy.sh 2008-01-16 16:55:22 UTC (rev 167) @@ -1 +1 @@ -mvn clean package jboss:harddeploy +mvn -o clean package jboss:harddeploy Modified: trunk/simexplorer-is-service-ear/pom.xml =================================================================== --- trunk/simexplorer-is-service-ear/pom.xml 2008-01-16 16:54:21 UTC (rev 166) +++ trunk/simexplorer-is-service-ear/pom.xml 2008-01-16 16:55:22 UTC (rev 167) @@ -42,6 +42,12 @@ <version>0.0.1-SNAPSHOT</version> <type>ejb</type> </dependency> + <dependency> + <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-security</artifactId> + <version>0.0.1-SNAPSHOT</version> + <type>ejb</type> + </dependency> </dependencies> </project> \ No newline at end of file Added: trunk/simexplorer-is-service-ear/profiles.xml =================================================================== --- trunk/simexplorer-is-service-ear/profiles.xml (rev 0) +++ trunk/simexplorer-is-service-ear/profiles.xml 2008-01-16 16:55:22 UTC (rev 167) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<settings> + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <!-- id du projet du labs (buix) --> + <labs.id>130</labs.id> + <!--Source base dir--> + <maven.src.dir>${basedir}/src</maven.src.dir> + <!--Test--> + <maven.test.skip>true</maven.test.skip> + <!--Compile with ?--> + <maven.compile.source>1.5</maven.compile.source> + <maven.compile.target>1.5</maven.compile.target> + <!--Main class in JAR + <maven.jar.main.class> + jaxx.compiler.JAXXCompiler + </maven.jar.main.class> + --> + </properties> + </profile> + </profiles> +</settings> \ No newline at end of file Added: trunk/simexplorer-is-storage/profiles.xml =================================================================== --- trunk/simexplorer-is-storage/profiles.xml (rev 0) +++ trunk/simexplorer-is-storage/profiles.xml 2008-01-16 16:55:22 UTC (rev 167) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<settings> + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <!-- id du projet du labs (buix) --> + <labs.id>130</labs.id> + <!--Source base dir--> + <maven.src.dir>${basedir}/src</maven.src.dir> + <!--Test--> + <maven.test.skip>true</maven.test.skip> + <!--Compile with ?--> + <maven.compile.source>1.5</maven.compile.source> + <maven.compile.target>1.5</maven.compile.target> + <!--Main class in JAR + <maven.jar.main.class> + jaxx.compiler.JAXXCompiler + </maven.jar.main.class> + --> + </properties> + </profile> + </profiles> +</settings> \ No newline at end of file Modified: trunk/simexplorer-is-web/pom.xml =================================================================== --- trunk/simexplorer-is-web/pom.xml 2008-01-16 16:54:21 UTC (rev 166) +++ trunk/simexplorer-is-web/pom.xml 2008-01-16 16:55:22 UTC (rev 167) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <project> <modelVersion>4.0.0</modelVersion> - + <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-web</artifactId> <name>Web</name> - + <packaging>war</packaging> <version>0.0.1-SNAPSHOT</version> <description></description> @@ -18,39 +18,51 @@ <build> <plugins> + <!--WebApp in JAR --> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>tomcat-maven-plugin</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.0.1</version><!-- force version because maven seem to can't find automaticaly --> <configuration> - <server>tomcat</server> - <url>http://localhost:18080/manager</url> - <path>/simexplorer</path> - <update>true</update> + <warSourceDirectory> + ${basedir}/src/main/webapp + </warSourceDirectory> </configuration> </plugin> - <plugin><!-- clean up from war:inplace --> - <artifactId>maven-clean-plugin</artifactId> + + <!-- Run the application using "mvn jetty:run" --> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> <configuration> - <filesets> - <fileset> - <directory> - ${basedir}/src/main/webapp/WEB-INF/lib - </directory> - </fileset> - <fileset> - <directory> - ${basedir}/src/main/webapp/WEB-INF/classes - </directory> - </fileset> - </filesets> + <!-- Log to the console. --> + <requestLog + implementation="org.mortbay.jetty.NCSARequestLog"> + <!-- This doesn't do anything for Jetty, but is a workaround for a Maven bug + that prevents the requestLog from being set. --> + <append>true</append> + </requestLog> + <connectors> + <connector + implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>9090</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> </configuration> </plugin> + </plugins> </build> <dependencies> <dependency> <groupId>simexplorer-is</groupId> + <artifactId>simexplorer-is-security</artifactId> + <version>0.0.1-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>simexplorer-is</groupId> <artifactId>simexplorer-is-entities</artifactId> <version>0.0.1-SNAPSHOT</version> </dependency> Added: trunk/simexplorer-is-web/profiles.xml =================================================================== --- trunk/simexplorer-is-web/profiles.xml (rev 0) +++ trunk/simexplorer-is-web/profiles.xml 2008-01-16 16:55:22 UTC (rev 167) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<settings> + <profiles> + <profile> + <id>project</id> + <activation> + <activeByDefault>true</activeByDefault> + </activation> + <properties> + <!-- id du projet du labs (buix) --> + <labs.id>130</labs.id> + <!--Source base dir--> + <maven.src.dir>${basedir}/src</maven.src.dir> + <!--Test--> + <maven.test.skip>true</maven.test.skip> + <!--Compile with ?--> + <maven.compile.source>1.5</maven.compile.source> + <maven.compile.target>1.5</maven.compile.target> + <!--Main class in JAR + <maven.jar.main.class> + jaxx.compiler.JAXXCompiler + </maven.jar.main.class> + --> + </properties> + </profile> + </profiles> +</settings> \ No newline at end of file