Author: tveronezi
Date: Wed Sep 25 10:41:41 2013
New Revision: 1526149
URL: http://svn.apache.org/r1526149
Log:
https://issues.apache.org/jira/browse/TOMEE-1036
* Moving stuff around: merging subprojects.
Added:
tomee/tomee/trunk/tomee/tomee-webaccess/src/
- copied from r1525996,
tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-gui/src/
tomee/tomee/trunk/tomee/tomee-webaccess/src/main/groovy/
- copied from r1525996,
tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-web/src/main/groovy/
Removed:
tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-gui/src/
tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-web/src/main/groovy/
Modified:
tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-gui/pom.xml
tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-web/pom.xml
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml?rev=1526149&r1=1526148&r2=1526149&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/pom.xml Wed Sep 25 10:41:41 2013
@@ -22,7 +22,7 @@
</parent>
<artifactId>tomee-webaccess</artifactId>
<version>1.6.0-SNAPSHOT</version>
- <packaging>pom</packaging>
+ <packaging>war</packaging>
<name>OpenEJB :: TomEE :: webaccess</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -30,60 +30,143 @@
<openejb.version>4.6.0-SNAPSHOT</openejb.version>
<javaee.api>6.0-5</javaee.api>
<junit.version>4.10</junit.version>
- <arquillian.version>1.0.3.Final</arquillian.version>
</properties>
- <modules>
- <module>webaccess-gui</module>
- <module>webaccess-web</module>
- </modules>
- <repositories>
- <repository>
- <id>apache.snapshots</id>
- <url>http://repository.apache.org/snapshots/</url>
- <releases>
- <updatePolicy>daily</updatePolicy>
- </releases>
- <snapshots>
- <updatePolicy>daily</updatePolicy>
- </snapshots>
- </repository>
- </repositories>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- <version>${openejb.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-server</artifactId>
- <version>${openejb.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- <version>${javaee.api}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- <version>2.1.7</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openejb.staticweb</groupId>
+ <artifactId>backbone</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb.staticweb</groupId>
+ <artifactId>bootstrap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb.staticweb</groupId>
+ <artifactId>jquery</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb.staticweb</groupId>
+ <artifactId>handlebars</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb.staticweb</groupId>
+ <artifactId>json2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb.staticweb</groupId>
+ <artifactId>lessjs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb.staticweb</groupId>
+ <artifactId>requirejs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb.staticweb</groupId>
+ <artifactId>underscorejs</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb.staticweb</groupId>
+ <artifactId>codemirror</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-core</artifactId>
+ <version>${openejb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>openejb-server</artifactId>
+ <version>${openejb.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>${javaee.api}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy-all</artifactId>
+ <version>2.1.7</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.googlecode.jslint4java</groupId>
+ <artifactId>jslint4java-maven-plugin</artifactId>
+ <version>2.0.5</version>
+ <configuration>
+ <failOnError>true</failOnError>
+ <options>
+ <vars>true</vars>
+ <unparam>true</unparam>
+
<predef>define,require,requirejs,window,Backbone,_,$,Handlebars,CodeMirror,APP_CONFIG</predef>
+ <indent>4</indent>
+ </options>
+ <sourceFolders>
+ <sourceFolder>${basedir}/src/main/webapp/app/js</sourceFolder>
+ </sourceFolders>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>lint</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.4</version>
+ <configuration>
+ <providerSelection>2.0</providerSelection>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generateStubs</goal>
+ <goal>compile</goal>
+ <goal>generateTestStubs</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.openejb.maven</groupId>
+ <artifactId>tomee-maven-plugin</artifactId>
+ <version>${project.version}</version>
+ <configuration>
+ <simpleLog>true</simpleLog>
+ <context>ROOT</context>
+ <tomeeClassifier>jaxrs</tomeeClassifier>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-gui/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-gui/pom.xml?rev=1526149&r1=1526148&r2=1526149&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-gui/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-gui/pom.xml Wed Sep 25
10:41:41 2013
@@ -28,128 +28,7 @@
<version>1.6.0-SNAPSHOT</version>
<packaging>war</packaging>
<name>OpenEJB :: TomEE :: webaccess :: webaccess-gui</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>webaccess-web</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>backbone</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>bootstrap</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>jquery</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>handlebars</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>json2</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>lessjs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>requirejs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>underscorejs</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb.staticweb</groupId>
- <artifactId>codemirror</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>com.github.searls</groupId>
- <artifactId>jasmine-maven-plugin</artifactId>
- <version>1.2.0.0</version>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>test</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <preloadSources>
-
<source>http://localhost:8234/src/main/webapp/app/lib/require/require.js</source>
-
<source>http://localhost:8234/src/test/resources/test_config.js</source>
-
<source>http://localhost:8234/src/main/webapp/app/config.js</source>
- <source>http://localhost:8234/src/test/resources/start.js</source>
- </preloadSources>
- <jsSrcDir>${project.basedir}/src/main/webapp</jsSrcDir>
- <!-- We need to point to an empty directory, otherwise jasmine loads
the test files before
- RequireJs finishes loading the requirements. The solution is to let
RequireJs load
- the test files too. -->
-
<jsTestSrcDir>${project.basedir}/src/test/javascript/empty</jsTestSrcDir>
- <sourceIncludes>
- <!-- Nothing to include. Require.js will load it for us -->
- </sourceIncludes>
-
<customRunnerTemplate>src/test/resources/runner.html</customRunnerTemplate>
- <!-- We should skip the tests for now. -->
- <skipTests>true</skipTests>
- </configuration>
- </plugin>
- <plugin>
- <groupId>com.googlecode.jslint4java</groupId>
- <artifactId>jslint4java-maven-plugin</artifactId>
- <version>2.0.5</version>
- <configuration>
- <failOnError>true</failOnError>
- <options>
- <vars>true</vars>
- <unparam>true</unparam>
-
<predef>define,require,requirejs,window,Backbone,_,$,Handlebars,CodeMirror,APP_CONFIG</predef>
- <indent>4</indent>
- </options>
- <sourceFolders>
- <sourceFolder>${basedir}/src/main/webapp/app/js</sourceFolder>
- </sourceFolders>
- </configuration>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>lint</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.openejb.maven</groupId>
- <artifactId>tomee-maven-plugin</artifactId>
- <version>${project.version}</version>
- <configuration>
- <simpleLog>true</simpleLog>
- <context>ROOT</context>
- <tomeeClassifier>jaxrs</tomeeClassifier>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
+
</project>
Modified: tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-web/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-web/pom.xml?rev=1526149&r1=1526148&r2=1526149&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-web/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-webaccess/webaccess-web/pom.xml Wed Sep 25
10:41:41 2013
@@ -29,51 +29,11 @@
<packaging>jar</packaging>
<name>OpenEJB :: TomEE :: webaccess :: webaccess-web</name>
<dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>openejb-server</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
- <artifactId>javaee-api</artifactId>
- </dependency>
+
</dependencies>
<build>
<plugins>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.4</version>
- <configuration>
- <providerSelection>2.0</providerSelection>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>generateTestStubs</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+
</plugins>
</build>
</project>
