Skip to content

Riina Antikainen / Moya

Go to a project
Commit 013a91c1 by Tuukka Kivilahti
Options

Merge branch 'earname' into 'master' 

java melody to correct place

Java melody has been included in each web projects lib-directory, which is wrong way to monitor application with multiple web-modules.
The correct way is to include JAR in ear project and add melody as a module to EARs application.xml and then add melody filter to each web-modules web.xml.

Downside in this approach is that because eclipse is stupid and unpacks automatically only projects which are found from the workspace, either melody has to be added to workspace or all modules have to be packed and left for glassfish to unpack. If glassfish unpacks the project eclipse has to deploy the whole application each time any resource is updated instead of updating just changed files.

Property for packed JAR deployment for glassfish can be found from doubleclicking the glassfish instance from 'servers' tab. Under 'Application Server' select 'open server properties page...'. Select 'glassfish' and check 'use jar archives for deployment'

See merge request !272
2 parents 88d6b2af 238a478f
Inline Side-by-side
Showing with 72 additions and 19 deletions
code/moya-ear/pom.xml
......@@ -10,11 +10,23 @@
<artifactId>maven-ear-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<applicationName>Moya</applicationName>
<earSourceDirectory>EarContent</earSourceDirectory>
<generateApplicationXml>true</generateApplicationXml>
<version>7</version>
<defaultLibBundleDir>lib</defaultLibBundleDir>
<modules>
<jarModule>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
</jarModule>
<jarModule>
<groupId>org.jrobin</groupId>
<artifactId>jrobin</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
</jarModule>
<ejbModule>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans</artifactId>
......@@ -29,9 +41,14 @@
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
<version>${javamelody.version}</version>
</dependency>
<dependency>
<groupId>fi.codecrew.moya</groupId>
<artifactId>moya-beans</artifactId>
<version>1.2-SNAPSHOT</version>
......@@ -75,7 +92,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<configuration>
<unpackTypes>war,ejb</unpackTypes>
<unpackTypes>war,ejb,jar</unpackTypes>
</configuration>
</plugin>
</plugins>
......
code/moya-mgmt-web/WebContent/WEB-INF/web.xml
......@@ -23,12 +23,28 @@
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
<!-- Java melody monitoring -->
<filter>
<filter-name>javamelody</filter-name>
<filter-class>net.bull.javamelody.MonitoringFilter</filter-class>
<async-supported>true</async-supported>
</filter>
<filter-mapping>
<filter-name>javamelody</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>net.bull.javamelody.SessionListener</listener-class>
</listener>
<filter>
<display-name>PrimefacesFileupload</display-name>
<filter-name>PrimefacesFileupload</filter-name>
<filter-class>org.primefaces.webapp.filter.FileUploadFilter</filter-class>
</filter>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
......
code/moya-mgmt-web/pom.xml
......@@ -11,7 +11,7 @@
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
<packagingIncludes>WEB-INF/lib/prettyfaces-core*,WEB-INF/lib/javamelody-core*,WEB-INF/lib/primefaces*,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*</packagingIncludes>
<packagingIncludes>WEB-INF/lib/prettyfaces-core*,WEB-INF/lib/primefaces*,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*</packagingIncludes>
</configuration>
</plugin>
</plugins>
......
code/moya-terminal-web/WebContent/WEB-INF/web.xml
......@@ -14,6 +14,22 @@
<session-config>
<session-timeout>30</session-timeout>
</session-config>
<!-- Java melody monitoring -->
<filter>
<filter-name>javamelody</filter-name>
<filter-class>net.bull.javamelody.MonitoringFilter</filter-class>
<async-supported>true</async-supported>
</filter>
<filter-mapping>
<filter-name>javamelody</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>net.bull.javamelody.SessionListener</listener-class>
</listener>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
......
code/moya-terminal-web/pom.xml
......@@ -12,7 +12,7 @@
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
<packagingIncludes>WEB-INF/lib/javamelody-core*,WEB-INF/lib/primefaces*,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*</packagingIncludes>
<packagingIncludes>WEB-INF/lib/primefaces*,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*</packagingIncludes>
</configuration>
</plugin>
</plugins>
......@@ -29,11 +29,7 @@
<artifactId>primefaces</artifactId>
<version>${primefaces.version}</version>
</dependency>
<dependency>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
<version>${javamelody.version}</version>
</dependency>
</dependencies>
<parent>
<groupId>fi.codecrew.moya</groupId>
......
code/moya-web/WebContent/WEB-INF/web.xml
......@@ -22,13 +22,25 @@
<absolute-ordering>
<name>jsonpFilter</name>
<name>hostnameFilter</name>
</absolute-ordering>
<context-param>
<param-name>javax.faces.PROJECT_STAGE</param-name>
<param-value>Development</param-value>
</context-param>
<!-- Java melody monitoring -->
<filter>
<filter-name>javamelody</filter-name>
<filter-class>net.bull.javamelody.MonitoringFilter</filter-class>
<async-supported>true</async-supported>
</filter>
<filter-mapping>
<filter-name>javamelody</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
<listener>
<listener-class>net.bull.javamelody.SessionListener</listener-class>
</listener>
<filter>
<display-name>PrimefacesFileupload</display-name>
......@@ -40,7 +52,7 @@
<filter-name>PrimefacesFileupload</filter-name>
<servlet-name>Faces Servlet</servlet-name>
</filter-mapping>
<servlet>
<servlet-name>Faces Servlet</servlet-name>
<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
......
code/moya-web/pom.xml
......@@ -12,7 +12,7 @@
<configuration>
<warSourceDirectory>WebContent</warSourceDirectory>
<failOnMissingWebXml>false</failOnMissingWebXml>
<packagingIncludes>WEB-INF/lib/moya-restpojo*,WEB-INF/lib/javamelody-core*,WEB-INF/lib/primefaces*,WEB-INF/lib/*-1.0.8.jar,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*,swagger/**</packagingIncludes>
<packagingIncludes>WEB-INF/lib/moya-restpojo*,WEB-INF/lib/primefaces*,WEB-INF/lib/*-1.0.8.jar,**/*.xml,**/*.xhtml,**/*.properties,**/*.class,**/*.png,**/*.css,**/*.js,resources/*,swagger/**</packagingIncludes>
</configuration>
</plugin>
</plugins>
......@@ -24,11 +24,7 @@
<artifactId>moya-beans-client</artifactId>
<version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.bull.javamelody</groupId>
<artifactId>javamelody-core</artifactId>
<version>${javamelody.version}</version>
</dependency>
<dependency>
<groupId>org.primefaces</groupId>
<artifactId>primefaces</artifactId>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!