Skip to content

Commit

Permalink
refactoring of maven poms, added wildfly profile and fixed tomcat pro…
Browse files Browse the repository at this point in the history 
…file

git-svn-id: svn://svn.forge.objectweb.org/svnroot/spagobi/V_5.x/Server/trunk@25790 99afaf0d-6903-0410-885a-c66a8bbb5f81
  • Loading branch information
@fabrizyo
fabrizyo committed Dec 22, 2015
1 parent 8727e5c commit 170d21e
Show file tree
Hide file tree
Showing 25 changed files with 342 additions and 1,023 deletions.
56 changes: 1 addition & 55 deletions SpagoBIAccessibilityEngine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<artifactId>SpagoBIAccessibilityEngine</artifactId>
<packaging>war</packaging>

<properties>
<war.deploy.dir>${project.build.directory}/${project.artifactId}</war.deploy.dir>
</properties>

<dependencies>

<dependency>
Expand Down Expand Up @@ -62,57 +58,7 @@

</dependencies>

<profiles>

<profile>
<id>tomcat-deploy</id>
<properties>
<war.deploy.dir>${tomcat.home}/webapps/${project.artifactId}</war.deploy.dir>
</properties>
</profile>

<profile>
<id>cas-enabled</id>
<properties>
<enable.cas.start>&lt;!--</enable.cas.start>
<enable.cas.end>--&gt;</enable.cas.end>
</properties>
</profile>
</profiles>

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<webResources>
<resource>
<filtering>true</filtering>
<directory>src/main/webapp</directory>
<includes>
<include>**/web.xml</include>
</includes>
</resource>
</webResources>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
<webappDirectory>${war.deploy.dir}</webappDirectory>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Built-By>SpagoBI Labs</Built-By>
</manifestEntries>
</archive>
<containerConfigXML>/src/main/webapp/META-INF</containerConfigXML>
</configuration>
</plugin>


</plugins>
</build>

</project>
57 changes: 1 addition & 56 deletions SpagoBIBirtReportEngine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<artifactId>SpagoBIBirtReportEngine</artifactId>
<packaging>war</packaging>

<properties>
<war.deploy.dir>${project.build.directory}/${project.artifactId}</war.deploy.dir>
</properties>

<dependencies>
<dependency>
<groupId>it.eng.spagobi</groupId>
Expand Down Expand Up @@ -57,57 +53,6 @@

</dependencies>

<profiles>

<profile>
<id>tomcat-deploy</id>
<properties>
<war.deploy.dir>${tomcat.home}/webapps/${project.artifactId}</war.deploy.dir>
</properties>
</profile>

<profile>
<id>cas-enabled</id>
<properties>
<enable.cas.start>&lt;!--</enable.cas.start>
<enable.cas.end>--&gt;</enable.cas.end>
</properties>
</profile>
</profiles>

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<webResources>
<resource>
<filtering>true</filtering>
<directory>src/main/webapp</directory>
<includes>
<include>**/web.xml</include>
</includes>
</resource>
</webResources>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
<webappDirectory>${war.deploy.dir}</webappDirectory>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Built-By>SpagoBI Labs</Built-By>
</manifestEntries>
</archive>
<containerConfigXML>/src/main/webapp/META-INF</containerConfigXML>
</configuration>
</plugin>

</plugins>
</build>


</project>
61 changes: 9 additions & 52 deletions SpagoBIChartEngine/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<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">
<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>
Expand All @@ -12,9 +11,6 @@
<artifactId>SpagoBIChartEngine</artifactId>
<packaging>war</packaging>

<properties>
<war.deploy.dir>${project.build.directory}/${project.artifactId}</war.deploy.dir>
</properties>

<dependencies>

Expand Down Expand Up @@ -63,6 +59,13 @@
<version>9.2.12.v20150709</version>
</dependency>

<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
<version>9.2.12.v20150709</version>
</dependency>


<dependency>
<groupId>org.cometd.java</groupId>
<artifactId>cometd-java-websocket-javax-server</artifactId>
Expand Down Expand Up @@ -142,55 +145,9 @@
</build>
</profile>

<profile>
<id>tomcat-deploy</id>
<properties>
<war.deploy.dir>${tomcat.home}/webapps/${project.artifactId}</war.deploy.dir>
</properties>
</profile>

<profile>
<id>cas-enabled</id>
<properties>
<enable.cas.start>&lt;!--</enable.cas.start>
<enable.cas.end>--&gt;</enable.cas.end>
</properties>
</profile>
</profiles>

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<webResources>
<resource>
<filtering>true</filtering>
<directory>src/main/webapp</directory>
<includes>
<include>**/web.xml</include>
</includes>
</resource>
</webResources>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
<webappDirectory>${war.deploy.dir}</webappDirectory>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Built-By>SpagoBI Labs</Built-By>
</manifestEntries>
</archive>
<containerConfigXML>/src/main/webapp/META-INF</containerConfigXML>
</configuration>
</plugin>

</plugins>
</build>


</project>
51 changes: 0 additions & 51 deletions SpagoBICockpitEngine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<artifactId>SpagoBICockpitEngine</artifactId>
<packaging>war</packaging>

<properties>
<war.deploy.dir>${project.build.directory}/${project.artifactId}</war.deploy.dir>
</properties>

<dependencies>

Expand Down Expand Up @@ -145,56 +142,8 @@
</build>
</profile>

<profile>
<id>tomcat-deploy</id>
<properties>
<war.deploy.dir>${tomcat.home}/webapps/${project.artifactId}</war.deploy.dir>
</properties>
</profile>

<profile>
<id>cas-enabled</id>
<properties>
<enable.cas.start>&lt;!--</enable.cas.start>
<enable.cas.end>--&gt;</enable.cas.end>
</properties>
</profile>

</profiles>

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<webResources>
<resource>
<filtering>true</filtering>
<directory>src/main/webapp</directory>
<includes>
<include>**/web.xml</include>
</includes>
</resource>
</webResources>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
<webappDirectory>${war.deploy.dir}</webappDirectory>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Built-By>SpagoBI Labs</Built-By>
</manifestEntries>
</archive>
<containerConfigXML>/src/main/webapp/META-INF</containerConfigXML>
</configuration>
</plugin>

</plugins>
</build>

</project>
54 changes: 2 additions & 52 deletions SpagoBICommonJEngine/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@
<artifactId>SpagoBICommonJEngine</artifactId>
<packaging>war</packaging>

<properties>
<war.deploy.dir>${project.build.directory}/${project.artifactId}</war.deploy.dir>
</properties>

<dependencies>

Expand Down Expand Up @@ -87,56 +84,9 @@
</build>
</profile>

<profile>
<id>tomcat-deploy</id>
<properties>
<war.deploy.dir>${tomcat.home}/webapps/${project.artifactId}</war.deploy.dir>
</properties>
</profile>

<profile>
<id>cas-enabled</id>
<properties>
<enable.cas.start>&lt;!--</enable.cas.start>
<enable.cas.end>--&gt;</enable.cas.end>
</properties>
</profile>


</profiles>

<build>
<plugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<webResources>
<resource>
<filtering>true</filtering>
<directory>src/main/webapp</directory>
<includes>
<include>**/web.xml</include>
</includes>
</resource>
</webResources>
<warSourceDirectory>src/main/webapp</warSourceDirectory>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
<webappDirectory>${war.deploy.dir}</webappDirectory>
<archive>
<manifest>
<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
</manifest>
<manifestEntries>
<Built-By>SpagoBI Labs</Built-By>
</manifestEntries>
</archive>
<containerConfigXML>/src/main/webapp/META-INF</containerConfigXML>
</configuration>
</plugin>

</plugins>
</build>


</project>
18 changes: 8 additions & 10 deletions SpagoBICommonJEngine/src/main/webapp/WEB-INF/jboss-web.xml
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
<jboss-web>
<class-loading java2ClassLoadingCompliance="false">
<loader-repository>
dot.com:loader=SpagoBICommonJEngine
<loader-repository-config>java2ParentDelegation=false</loader-repository-config>
</loader-repository>
</class-loading>
<resource-ref>
<jboss-web xmlns="http://www.jboss.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss-web_5_1.xsd">
<context-root>/SpagoBICommonJEngine</context-root>
<resource-ref>
<res-ref-name>jdbc/spagobi</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<jndi-name>java:/spagobi</jndi-name>
<jndi-name>java:/jdbc/spagobi</jndi-name>
</resource-ref>
<resource-ref>
<resource-ref>
<res-ref-name>worker/worker</res-ref-name>
<res-type>javax.sql.DataSource</res-type>
<jndi-name>java:worker/worker</jndi-name>
Expand Down
Loading

0 comments on commit 170d21e

Please sign in to comment.