Commit c6575666 by Tuomas Riihimäki

Application.xml eariin.

1 parent 82f5b044
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
<dependent-module archiveName="moya-beans-0.2.0.jar" deploy-path="/" handle="module:/resource/MoyaBeans/MoyaBeans"> <dependent-module archiveName="moya-beans-0.2.0.jar" deploy-path="/" handle="module:/resource/MoyaBeans/MoyaBeans">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="moya-web-0.2.0.war" deploy-path="/" handle="module:/resource/MoyaWeb/MoyaWeb">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="moya-beans-client-0.2.0.jar" deploy-path="/lib" handle="module:/resource/MoyaBeansClient/MoyaBeansClient"> <dependent-module archiveName="moya-beans-client-0.2.0.jar" deploy-path="/lib" handle="module:/resource/MoyaBeansClient/MoyaBeansClient">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
...@@ -44,7 +47,10 @@ ...@@ -44,7 +47,10 @@
<dependent-module archiveName="commons-codec-1.6.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/commons-codec/commons-codec/1.6/commons-codec-1.6.jar"> <dependent-module archiveName="commons-codec-1.6.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/commons-codec/commons-codec/1.6/commons-codec-1.6.jar">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="moya-web-0.2.0.war" deploy-path="/" handle="module:/resource/MoyaWeb/MoyaWeb"> <dependent-module archiveName="slf4j-jdk14-1.7.5.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-jdk14/1.7.5/slf4j-jdk14-1.7.5.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="slf4j-api-1.7.5.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="commons-fileupload-1.3.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar"> <dependent-module archiveName="commons-fileupload-1.3.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar">
...@@ -56,10 +62,7 @@ ...@@ -56,10 +62,7 @@
<dependent-module archiveName="mina-core-2.0.5.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/apache/mina/mina-core/2.0.5/mina-core-2.0.5.jar"> <dependent-module archiveName="mina-core-2.0.5.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/apache/mina/mina-core/2.0.5/mina-core-2.0.5.jar">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
<dependent-module archiveName="slf4j-jdk14-1.7.5.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-jdk14/1.7.5/slf4j-jdk14-1.7.5.jar"> <dependent-module archiveName="jrobin-1.5.9.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/jrobin/jrobin/1.5.9/jrobin-1.5.9.jar">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="slf4j-api-1.7.5.jar" deploy-path="/lib" handle="module:/classpath/var/M2_REPO/org/slf4j/slf4j-api/1.7.5/slf4j-api-1.7.5.jar">
<dependency-type>uses</dependency-type> <dependency-type>uses</dependency-type>
</dependent-module> </dependent-module>
</wb-module> </wb-module>
......
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://xmlns.jcp.org/xml/ns/javaee"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd"
version="7">
<display-name>moya-ear</display-name>
<module>
<ejb>moya-beans-0.2.0.jar</ejb>
</module>
<module>
<web>
<web-uri>moya-web-0.2.0.war</web-uri>
<context-root>/MoyaWeb</context-root>
</web>
</module>
<library-directory>lib</library-directory>
</application>
\ No newline at end of file
...@@ -5,6 +5,16 @@ ...@@ -5,6 +5,16 @@
<artifactId>moya-ear</artifactId> <artifactId>moya-ear</artifactId>
<version>0.2.0</version> <version>0.2.0</version>
<packaging>ear</packaging> <packaging>ear</packaging>
<!-- Tätä kirjoitettaessa (2013-08-19) Eclipse ei osaa generoida -->
<!-- application.xml:ää automaattisesti ear-versiolle 7. Siksi file -->
<!-- on generoitu versiolla 6, kopioitu EarContent/META-INF alle ja -->
<!-- vaihdettu versio takaisin oikeaksi. - Tuomari -->
<!-- p.s oikea 7-version header: -->
<!-- <application xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://xmlns.jcp.org/xml/ns/javaee" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
http://xmlns.jcp.org/xml/ns/javaee/application_7.xsd" version="7"> -->
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
...@@ -15,11 +25,21 @@ ...@@ -15,11 +25,21 @@
<generateApplicationXml>true</generateApplicationXml> <generateApplicationXml>true</generateApplicationXml>
<version>7</version> <version>7</version>
<defaultLibBundleDir>lib</defaultLibBundleDir> <defaultLibBundleDir>lib</defaultLibBundleDir>
<modules>
<ejbModule>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans</artifactId>
</ejbModule>
<webModule>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-web</artifactId>
<contextRoot>/MoyaWeb</contextRoot>
</webModule>
</modules>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>fi.codecrew.moya</groupId> <groupId>fi.codecrew.moya</groupId>
...@@ -32,8 +52,13 @@ ...@@ -32,8 +52,13 @@
<artifactId>moya-web</artifactId> <artifactId>moya-web</artifactId>
<version>0.2.0</version> <version>0.2.0</version>
<type>war</type> <type>war</type>
</dependency>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-jdk14</artifactId>
<version>1.7.5</version>
</dependency>
<!-- Jos web-projektin antaa lisätä libinsä itse libit menevät tuplana --> <!-- Jos web-projektin antaa lisätä libinsä itse libit menevät tuplana -->
<!-- WEB-INF/lib hakemistoon. Rajoitetaan siis sinne meneviä libejä --> <!-- WEB-INF/lib hakemistoon. Rajoitetaan siis sinne meneviä libejä -->
...@@ -46,16 +71,21 @@ ...@@ -46,16 +71,21 @@
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
<version>1.3</version> <version>1.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.sshd</groupId> <groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId> <artifactId>sshd-core</artifactId>
<version>0.8.0</version> <version>0.8.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <!-- Java melody dependency -->
<artifactId>slf4j-jdk14</artifactId> <groupId>org.jrobin</groupId>
<version>1.7.5</version> <artifactId>jrobin</artifactId>
<version>1.5.9</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>
\ No newline at end of file
...@@ -5,5 +5,6 @@ ...@@ -5,5 +5,6 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<property name="context-root" value="moya-web"/> <property name="context-root" value="moya-web"/>
<property name="java-output-path" value="/MoyaWeb/target/classes"/> <property name="java-output-path" value="/MoyaWeb/target/classes"/>
<property name="component.inclusion.patterns" value="WEB-INF/lib/javamelody-core*,WEB-INF/lib/primefaces*,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*"/>
</wb-module> </wb-module>
</project-modules> </project-modules>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!