http://git-wip-us.apache.org/repos/asf/tomee/blob/4966cef1/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --cc maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml index 92a6ec2,64b833d..076f907 --- a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml +++ b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml @@@ -1,151 -1,151 +1,151 @@@ - <?xml version="1.0" encoding="UTF-8"?> - <!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You 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. - --> - <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/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <version>${version}</version> - <packaging>war</packaging> - <name>${artifactId} TomEE Webapp</name> - <url>http://tomee.apache.org</url> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.tomee</groupId> - <artifactId>javaee-api</artifactId> - <version>7.0</version> - <scope>provided</scope> - </dependency> - - <!-- to test with TomEE and Arquillian - <dependency> - <groupId>org.apache.tomee</groupId> - <artifactId>arquillian-tomee-remote</artifactId> - <version>[TOMEE]</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - --> - - <!-- to test with OpenEJB embedded and Arquillian - <dependency> - <groupId>org.apache.tomee</groupId> - <artifactId>arquillian-openejb-embedded</artifactId> - <version>[OPENEJB]</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.arquillian.junit</groupId> - <artifactId>arquillian-junit-container</artifactId> - <version>1.1.5.Final</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - --> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.18.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.4</version> - <configuration> - <failOnMissingWebXml>false</failOnMissingWebXml> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.tomee.maven</groupId> - <artifactId>tomee-maven-plugin</artifactId> - <version>[TOMEE]</version> - <configuration> - <context>ROOT</context> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa-maven-plugin</artifactId> - <version>2.4.0</version> - <configuration> - <includes>**/entities/*.class</includes> - <excludes>**/entities/XML*.class</excludes> - <addDefaultConstructor>true</addDefaultConstructor> - <enforcePropertyRestrictions>true</enforcePropertyRestrictions> - </configuration> - <executions> - <execution> - <id>enhancer</id> - <phase>process-classes</phase> - <goals> - <goal>enhance</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.apache.openjpa</groupId> - <artifactId>openjpa</artifactId> - <!-- set the version to be the same as the level in your runtime --> - <version>2.4.0</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - - <repositories> - <repository> - <id>apache-snapshot</id> - <name>Apache Snapshot Repository</name> - <url>https://repository.apache.org/content/groups/snapshots/</url> - </repository> - </repositories> - - </project> + <?xml version="1.0" encoding="UTF-8"?> + <!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. + --> + <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/maven-v4_0_0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <version>${version}</version> + <packaging>war</packaging> + <name>${artifactId} TomEE Webapp</name> + <url>http://tomee.apache.org</url> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.tomee</groupId> + <artifactId>javaee-api</artifactId> - <version>7.0-SNAPSHOT</version> ++ <version>7.0</version> + <scope>provided</scope> + </dependency> + + <!-- to test with TomEE and Arquillian + <dependency> + <groupId>org.apache.tomee</groupId> + <artifactId>arquillian-tomee-remote</artifactId> + <version>[TOMEE]</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <version>1.1.5.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + --> + + <!-- to test with OpenEJB embedded and Arquillian + <dependency> + <groupId>org.apache.tomee</groupId> + <artifactId>arquillian-openejb-embedded</artifactId> + <version>[OPENEJB]</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <version>1.1.5.Final</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + --> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.2</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.18.1</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.4</version> + <configuration> + <failOnMissingWebXml>false</failOnMissingWebXml> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.tomee.maven</groupId> + <artifactId>tomee-maven-plugin</artifactId> + <version>[TOMEE]</version> + <configuration> + <context>ROOT</context> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa-maven-plugin</artifactId> + <version>2.4.0</version> + <configuration> + <includes>**/entities/*.class</includes> + <excludes>**/entities/XML*.class</excludes> + <addDefaultConstructor>true</addDefaultConstructor> + <enforcePropertyRestrictions>true</enforcePropertyRestrictions> + </configuration> + <executions> + <execution> + <id>enhancer</id> + <phase>process-classes</phase> + <goals> + <goal>enhance</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.apache.openjpa</groupId> + <artifactId>openjpa</artifactId> + <!-- set the version to be the same as the level in your runtime --> + <version>2.4.0</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + + <repositories> + <repository> + <id>apache-snapshot</id> + <name>Apache Snapshot Repository</name> + <url>https://repository.apache.org/content/groups/snapshots/</url> + </repository> + </repositories> + + </project>
http://git-wip-us.apache.org/repos/asf/tomee/blob/4966cef1/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/4966cef1/tck/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/4966cef1/tomee/build.xml ---------------------------------------------------------------------- diff --cc tomee/build.xml index 7a5c630,c660e7c..2b595e7 --- a/tomee/build.xml +++ b/tomee/build.xml @@@ -1,46 -1,46 +1,46 @@@ - <?xml version="1.0" encoding="UTF-8"?> - <!-- - - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You 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. - --> - <project name="dev-helper" default="web"> - - <target name="web"> - <copy verbose="true" todir="apache-tomee/target/apache-tomee-webprofile-7.0.0-M1/webapps/tomee"> - <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.js"/> - <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.css"/> - <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.html"/> - </copy> - </target> - - <target name="rs"> - <copy verbose="true" todir="apache-tomee/target/apache-tomee-jaxrs-7.0.0-M1/webapps/tomee"> - <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.js"/> - <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.css"/> - <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.html"/> - </copy> - </target> - - <target name="plus"> - <copy verbose="true" todir="apache-tomee/target/apache-tomee-plus-7.0.0-M1/webapps/tomee"> - <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.js"/> - <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.css"/> - <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.html"/> - </copy> - </target> - - </project> - + <?xml version="1.0" encoding="UTF-8"?> + <!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. + --> + <project name="dev-helper" default="web"> + + <target name="web"> - <copy verbose="true" todir="apache-tomee/target/apache-tomee-webprofile-7.0.0-SNAPSHOT/webapps/tomee"> ++ <copy verbose="true" todir="apache-tomee/target/apache-tomee-webprofile-7.0.0-M1/webapps/tomee"> + <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.js"/> + <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.css"/> + <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.html"/> + </copy> + </target> + + <target name="rs"> - <copy verbose="true" todir="apache-tomee/target/apache-tomee-jaxrs-7.0.0-SNAPSHOT/webapps/tomee"> ++ <copy verbose="true" todir="apache-tomee/target/apache-tomee-jaxrs-7.0.0-M1/webapps/tomee"> + <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.js"/> + <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.css"/> + <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.html"/> + </copy> + </target> + + <target name="plus"> - <copy verbose="true" todir="apache-tomee/target/apache-tomee-plus-7.0.0-SNAPSHOT/webapps/tomee"> ++ <copy verbose="true" todir="apache-tomee/target/apache-tomee-plus-7.0.0-M1/webapps/tomee"> + <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.js"/> + <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.css"/> + <fileset dir="tomee-webapp/src/main/webapp" includes="**/*.html"/> + </copy> + </target> + + </project> + http://git-wip-us.apache.org/repos/asf/tomee/blob/4966cef1/tomee/tomee-juli/src/test/java/org/apache/tomee/jul/handler/rotating/LocalFileHandlerTest.java ----------------------------------------------------------------------
