Skip to content

Commit

Permalink
Got everything except -Pintegration-test working for the new archetyp…
Browse files Browse the repository at this point in the history 
…e project layour in bus-quickstart.
  • Loading branch information
@jfuerth
jfuerth committed Apr 5, 2012
1 parent 0542ca1 commit 499597d
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 94 deletions.
19 changes: 7 additions & 12 deletions bus-quickstart/src/main/resources/META-INF/maven/archetype-metadata.xml
View file
Expand Up @@ -28,23 +28,18 @@
<include>**/*.xml</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/jboss</directory>
<includes>
<include>**/*.xml</include>
</includes>
</fileSet>

<fileSet filtered="true" encoding="UTF-8">
<directory>src/jboss5</directory>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/jboss7</directory>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/jetty</directory>
<includes>
<include>**/*.xml</include>
</includes>
</fileSet>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/tomcat</directory>
<includes>
<include>**/*.xml</include>
</includes>
</fileSet>

<fileSet filtered="true" encoding="UTF-8">
Expand Down
113 changes: 32 additions & 81 deletions bus-quickstart/src/main/resources/archetype-resources/pom.xml
View file
Expand Up @@ -29,7 +29,6 @@
<gwt.version>2.4.0</gwt.version>
<gwt.maven.version>2.4.0</gwt.maven.version>
<slf4j.version>1.6.1</slf4j.version>
<webXmlPath>src/jetty/web.xml</webXmlPath>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

Expand Down Expand Up @@ -94,53 +93,20 @@

<profiles>
<profile>
<id>jboss5</id>

<id>jetty</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<webXmlPath>src/jboss/web.xml</webXmlPath>
<webDescriptor>jetty</webDescriptor>
</properties>

<dependencies>
<dependency>
<groupId>org.jboss.errai</groupId>
<artifactId>errai-ioc</artifactId>
<exclusions>
<exclusion>
<artifactId>jsr250-api</artifactId>
<groupId>javax.annotation</groupId>
</exclusion>
</exclusions>
<scope>compile</scope>
<version>\${errai.version}</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>\${slf4j.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>\${slf4j.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.15.0-GA</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>

<profile>
<id>jboss6</id>
<id>jboss5</id>

<properties>
<webXmlPath>src/jboss/web.xml</webXmlPath>
<webDescriptor>jboss5</webDescriptor>
</properties>

<dependencies>
Expand All @@ -152,22 +118,11 @@
<artifactId>jsr250-api</artifactId>
<groupId>javax.annotation</groupId>
</exclusion>
<exclusion>
<artifactId>javax.inject</artifactId>
<groupId>javax.inject</groupId>
</exclusion>
</exclusions>
<scope>compile</scope>
<version>\${errai.version}</version>
</dependency>

<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
<version>1</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand All @@ -190,26 +145,28 @@
</dependency>
</dependencies>
</profile>

<profile>
<id>jboss7</id>

<properties>
<webXmlPath>src/jboss/web.xml</webXmlPath>
<webDescriptor>jboss7</webDescriptor>
</properties>
</profile>

<profile>
<id>tomcat</id>

<properties>
<webXmlPath>src/tomcat/web.xml</webXmlPath>
<webDescriptor>tomcat</webDescriptor>
</properties>
</profile>

<!-- OpenShift Express Profiles -->
<profile>
<id>openshift</id>
<properties>
<webXmlPath>src/jboss/web.xml</webXmlPath>
<webDescriptor>jboss7</webDescriptor>
</properties>

<build>
Expand All @@ -218,9 +175,6 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<configuration>
<warSourceDirectory>src/main/webapp/</warSourceDirectory>
<webappDirectory>src/main/webapp/</webappDirectory>
<webXml>src/jetty/web.xml</webXml>
<outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
<packagingExcludes>**/javax/**/*.*,**/client/local/**/*.class</packagingExcludes>
<outputDirectory>deployments</outputDirectory>
Expand Down Expand Up @@ -270,7 +224,7 @@
<profile>
<id>openshift-prepare</id>
<properties>
<webXmlPath>src/jboss/web.xml</webXmlPath>
<webDescriptor>jboss7</webDescriptor>
</properties>

<build>
Expand All @@ -281,15 +235,15 @@
<configuration>
<warSourceDirectory>war.cache</warSourceDirectory>
<webappDirectory>war.cache</webappDirectory>
<webXml>src/jetty/web.xml</webXml>
<outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
<packagingExcludes>**/javax/**/*.*,**/client/local/**/*.class</packagingExcludes>

<archive>
<manifestEntries>
<Dependencies>org.jboss.as.naming,org.jboss.as.server,org.jboss.msc</Dependencies>
</manifestEntries>
</archive>
<webResources>
<resource>
<!-- this is relative to the pom.xml directory -->
<directory>src/${webDescriptor}</directory>
</resource>
</webResources>
</configuration>
</plugin>

Expand All @@ -303,13 +257,6 @@
<phase>prepare-package</phase>
<configuration>
<tasks>
<copy file="src/jboss/web.xml" toDir="src/main/webapp/WEB-INF"
overwrite="true" />

<delete file="src/main/webapp/WEB-INF/jetty-env.xml" />

<delete file="src/main/webapp/WEB-INF/classes/jndi.properties" />

<copy todir="war.cache/app/">
<fileset dir="src/main/webapp/app/" />
</copy>
Expand Down Expand Up @@ -520,7 +467,6 @@
</profiles>

<build>
<finalName>\${project.artifactId}</finalName>
<outputDirectory>src/main/webapp/WEB-INF/classes</outputDirectory>

<plugins>
Expand All @@ -529,13 +475,12 @@
<artifactId>gwt-maven-plugin</artifactId>
<version>\${gwt.maven.version}</version>
<configuration>
<inplace>true</inplace>
<logLevel>INFO</logLevel>
<runTarget>App.html</runTarget>
<warSourceDirectory>src/main/webapp/</warSourceDirectory>
<runTarget>App.html</runTarget>
<extraJvmArgs>-Xmx512m</extraJvmArgs>
<treeLogger>true</treeLogger>
<soyc>false</soyc>
<hostedWebapp>src/main/webapp/</hostedWebapp>
<treeLogger>true</treeLogger>
</configuration>
<executions>
<execution>
Expand Down Expand Up @@ -563,10 +508,16 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.1.1</version>
<configuration>
<warSourceDirectory>src/main/webapp/</warSourceDirectory>
<webXml>\${webXmlPath}</webXml>
<warName>\${project.artifactId}</warName>
<outputFileNameMapping>@{artifactId}@-@{baseVersion}@@{dashClassifier?}@.@{extension}@</outputFileNameMapping>
<packagingExcludes>**/javax/**/*.*,**/client/local/**/*.class</packagingExcludes>

<webResources>
<resource>
<!-- this is relative to the pom.xml directory -->
<directory>src/${webDescriptor}</directory>
</resource>
</webResources>
</configuration>
</plugin>

Expand Down Expand Up @@ -611,7 +562,7 @@
<configuration>
<filesets>
<fileset>
<directory>${basedir}</directory>
<directory>\${basedir}</directory>
<includes>
<include>www-test/**</include>
<include>.gwt/**</include>
Expand Down
0 ...ces/archetype-resources/src/jboss/web.xml → ...type-resources/src/jboss5/WEB-INF/web.xml
View file
File renamed without changes.
1 change: 1 addition & 0 deletions bus-quickstart/src/main/resources/archetype-resources/src/jboss7/META-INF/MANIFEST.MF
View file
@@ -0,0 +1 @@
Dependencies: org.jboss.as.naming,org.jboss.as.server,org.jboss.msc
34 changes: 34 additions & 0 deletions bus-quickstart/src/main/resources/archetype-resources/src/jboss7/WEB-INF/web.xml
View file
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ~ Copyright 2009 JBoss, a divison Red Hat, Inc ~ ~ Licensed under the
Apache License, Version 2.0 (the "License"); ~ you may not use this file
except in compliance with the License. ~ You may obtain a copy of the License
at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~ ~ Unless required by
applicable law or agreed to in writing, software ~ distributed under the
License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR CONDITIONS
OF ANY KIND, either express or implied. ~ See the License for the specific
language governing permissions and ~ limitations under the License. -->

<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
version="2.5">
<servlet>

<!-- NOTE: the integration-test profile uses this web.xml. Integration tests only work properly
with the DefaultBlockingServlet. If you change this setting, alter the integration-test
profile in pom.xml to use a different web.xml (for example, maybe src/tomcat/web.xml) -->
<servlet-name>ErraiServlet</servlet-name>
<servlet-class>org.jboss.errai.bus.server.servlet.DefaultBlockingServlet</servlet-class>

<load-on-startup>1</load-on-startup>
</servlet>

<servlet-mapping>
<servlet-name>ErraiServlet</servlet-name>
<url-pattern>*.erraiBus</url-pattern>
</servlet-mapping>

<welcome-file-list>
<welcome-file>App.html</welcome-file>
</welcome-file-list>
</web-app>
0 ...es/archetype-resources/src/tomcat/web.xml → ...etype-resources/src/jetty/WEB-INF/web.xml
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...ces/archetype-resources/src/jetty/web.xml → ...type-resources/src/tomcat/WEB-INF/web.xml
View file
Expand Up @@ -14,7 +14,7 @@
version="2.5">
<servlet>
<servlet-name>ErraiServlet</servlet-name>
<servlet-class>org.jboss.errai.bus.server.servlet.JettyContinuationsServlet</servlet-class>
<servlet-class>org.jboss.errai.bus.server.servlet.DefaultBlockingServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>

Expand Down

0 comments on commit 499597d

Please sign in to comment.