Repository: tomee Updated Branches: refs/heads/master 886f34887 -> eb7a8fc40
EOL I guess, didnt open or edited anything in this clone yet - part 2 Project: http://git-wip-us.apache.org/repos/asf/tomee/repo Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/eb7a8fc4 Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/eb7a8fc4 Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/eb7a8fc4 Branch: refs/heads/master Commit: eb7a8fc40d94f476aa8171838bbd0925fbc001a0 Parents: 886f348 Author: Romain Manni-Bucau <[email protected]> Authored: Mon Nov 23 15:14:41 2015 +0100 Committer: Romain Manni-Bucau <[email protected]> Committed: Mon Nov 23 15:14:41 2015 +0100 ---------------------------------------------------------------------- .../openejb/cipher/SafePasswordCipher.java | 60 ++-- .../openejb/cipher/SafePasswordCipherBase.java | 50 +-- .../org/apache/openejb/util/NetworkUtil.java | 270 ++++++++--------- examples/applet/pom.xml | 2 +- .../WebApp1/pom.xml | 204 ++++++------- .../WebApp2/pom.xml | 194 ++++++------ examples/cdi-ejbcontext-jaas/pom.xml | 2 +- examples/cdi-produces-field/pom.xml | 194 ++++++------ .../webservice-ws-with-resources-config/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 302 +++++++++---------- 10 files changed, 640 insertions(+), 640 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipher.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipher.java b/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipher.java index 06f4f5f..0ef6174 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipher.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipher.java @@ -1,30 +1,30 @@ -/* - * 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. - */ - -package org.apache.openejb.cipher; - -// we dont use char[]->char[] for encrypt since it is a tool only method normally (execution time ~ few seconds) -public interface SafePasswordCipher extends PasswordCipher { - /** - * Note: decrypt method is not wired to decryptAsCharArray() by default. You can forbid its usage - * throwing an exception (UnsupportedOperationException) is desired. - * - * @param encryptedPassword - * @return the decrypted password. - */ - char[] decryptAsCharArray(char[] encryptedPassword); -} +/* + * 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. + */ + +package org.apache.openejb.cipher; + +// we dont use char[]->char[] for encrypt since it is a tool only method normally (execution time ~ few seconds) +public interface SafePasswordCipher extends PasswordCipher { + /** + * Note: decrypt method is not wired to decryptAsCharArray() by default. You can forbid its usage + * throwing an exception (UnsupportedOperationException) is desired. + * + * @param encryptedPassword + * @return the decrypted password. + */ + char[] decryptAsCharArray(char[] encryptedPassword); +} http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipherBase.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipherBase.java b/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipherBase.java index 4df47f2..260166c 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipherBase.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/cipher/SafePasswordCipherBase.java @@ -1,25 +1,25 @@ -/* - * 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. - */ - -package org.apache.openejb.cipher; - -public abstract class SafePasswordCipherBase implements SafePasswordCipher { - @Override - public String decrypt(final char[] encryptedPassword) { - throw new UnsupportedOperationException(getClass().getName() + " doesn't support String decryption"); - } -} +/* + * 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. + */ + +package org.apache.openejb.cipher; + +public abstract class SafePasswordCipherBase implements SafePasswordCipher { + @Override + public String decrypt(final char[] encryptedPassword) { + throw new UnsupportedOperationException(getClass().getName() + " doesn't support String decryption"); + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/container/openejb-core/src/main/java/org/apache/openejb/util/NetworkUtil.java ---------------------------------------------------------------------- diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/NetworkUtil.java b/container/openejb-core/src/main/java/org/apache/openejb/util/NetworkUtil.java index f08ab2e..873e336 100644 --- a/container/openejb-core/src/main/java/org/apache/openejb/util/NetworkUtil.java +++ b/container/openejb-core/src/main/java/org/apache/openejb/util/NetworkUtil.java @@ -1,135 +1,135 @@ -/* - * 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. - */ - -package org.apache.openejb.util; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.net.ServerSocket; -import java.net.SocketException; -import java.util.Collection; - -public final class NetworkUtil { - - private NetworkUtil() { - // no-op - } - - /** - * Get the next available port using ServerSocket(0). - * This is not random and will result in port duplicates if many threads call this concurrently - * - * @return an unused port at the time of calling - */ - public static int getNextAvailablePort() { - return getNextAvailablePort(new int[]{0}); - } - - public static int getNextAvailablePort(final int[] portList) { - int port; - ServerSocket s = null; - try { - s = create(portList); - port = s.getLocalPort(); - } catch (final IOException ioe) { - port = -1; - } finally { - if (s != null) { - try { - s.close(); - } catch (final Throwable e) { - //Ignore - } - } - } - return port; - } - - public static int getNextAvailablePort(final int min, final int max, final Collection<Integer> excepted) { - int port = -1; - ServerSocket s = null; - for (int i = min; i <= max; i++) { - try { - s = create(new int[]{i}); - port = s.getLocalPort(); - - if (excepted == null || !excepted.contains(port)) { - break; - } - } catch (final IOException ioe) { - port = -1; - } finally { - if (s != null) { - try { - s.close(); - } catch (final Throwable e) { - //Ignore - } - } - } - } - return port; - } - - private static ServerSocket create(final int[] ports) throws IOException { - for (final int port : ports) { - try { - return new ServerSocket(port); - } catch (final IOException ex) { - // try next port - } - } - - // if the program gets here, no port in the range was found - throw new IOException("No free port found"); - } - - public static String getLocalAddress(final String start, final String end) { - return start + "localhost:" + getNextAvailablePort() + end; - } - - public static boolean isLocalAddress(final String addr) { - try { - return isLocalAddress(InetAddress.getByName(addr)); - } catch (final Exception e) { - return false; - } - } - - public static boolean isLocalAddress(final InetAddress addr) { - - if (addr.isAnyLocalAddress() || addr.isLoopbackAddress()) { - return true; - } - - // Check if the address is defined on any interface - try { - return NetworkInterface.getByInetAddress(addr) != null; - } catch (final SocketException e) { - return false; - } - } - - private static final class LastPort { - private final int port; - - private LastPort(final int port) { - this.port = port; - } - } -} +/* + * 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. + */ + +package org.apache.openejb.util; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.net.ServerSocket; +import java.net.SocketException; +import java.util.Collection; + +public final class NetworkUtil { + + private NetworkUtil() { + // no-op + } + + /** + * Get the next available port using ServerSocket(0). + * This is not random and will result in port duplicates if many threads call this concurrently + * + * @return an unused port at the time of calling + */ + public static int getNextAvailablePort() { + return getNextAvailablePort(new int[]{0}); + } + + public static int getNextAvailablePort(final int[] portList) { + int port; + ServerSocket s = null; + try { + s = create(portList); + port = s.getLocalPort(); + } catch (final IOException ioe) { + port = -1; + } finally { + if (s != null) { + try { + s.close(); + } catch (final Throwable e) { + //Ignore + } + } + } + return port; + } + + public static int getNextAvailablePort(final int min, final int max, final Collection<Integer> excepted) { + int port = -1; + ServerSocket s = null; + for (int i = min; i <= max; i++) { + try { + s = create(new int[]{i}); + port = s.getLocalPort(); + + if (excepted == null || !excepted.contains(port)) { + break; + } + } catch (final IOException ioe) { + port = -1; + } finally { + if (s != null) { + try { + s.close(); + } catch (final Throwable e) { + //Ignore + } + } + } + } + return port; + } + + private static ServerSocket create(final int[] ports) throws IOException { + for (final int port : ports) { + try { + return new ServerSocket(port); + } catch (final IOException ex) { + // try next port + } + } + + // if the program gets here, no port in the range was found + throw new IOException("No free port found"); + } + + public static String getLocalAddress(final String start, final String end) { + return start + "localhost:" + getNextAvailablePort() + end; + } + + public static boolean isLocalAddress(final String addr) { + try { + return isLocalAddress(InetAddress.getByName(addr)); + } catch (final Exception e) { + return false; + } + } + + public static boolean isLocalAddress(final InetAddress addr) { + + if (addr.isAnyLocalAddress() || addr.isLoopbackAddress()) { + return true; + } + + // Check if the address is defined on any interface + try { + return NetworkInterface.getByInetAddress(addr) != null; + } catch (final SocketException e) { + return false; + } + } + + private static final class LastPort { + private final int port; + + private LastPort(final int port) { + this.port = port; + } + } +} http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/examples/applet/pom.xml ---------------------------------------------------------------------- diff --git a/examples/applet/pom.xml b/examples/applet/pom.xml index 6359b73..60ac4d6 100644 --- a/examples/applet/pom.xml +++ b/examples/applet/pom.xml @@ -57,7 +57,7 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> + <artifactId>maven-compiler-plugin</artifactId> <version>3.2</version> <configuration> <source>1.7</source> http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/examples/bval-evaluation-redeployment/WebApp1/pom.xml ---------------------------------------------------------------------- diff --git a/examples/bval-evaluation-redeployment/WebApp1/pom.xml b/examples/bval-evaluation-redeployment/WebApp1/pom.xml index e7fb7ae..83a8a15 100644 --- a/examples/bval-evaluation-redeployment/WebApp1/pom.xml +++ b/examples/bval-evaluation-redeployment/WebApp1/pom.xml @@ -1,102 +1,102 @@ -<?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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.superbiz</groupId> - <artifactId>bval-evaluation-redeployment</artifactId> - <version>1.1.0-SNAPSHOT</version> - </parent> - - <artifactId>WebApp1</artifactId> - <packaging>war</packaging> - - <name>WebApp1</name> - - <properties> - <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.tomee</groupId> - <artifactId>javaee-api</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - </dependency> - <dependency> - <groupId>org.apache.tomee</groupId> - <artifactId>openejb-cxf-rs</artifactId> - <scope>provided</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - <compilerArguments> - <endorseddirs>${endorsed.dir}</endorseddirs> - </compilerArguments> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <failOnMissingWebXml>false</failOnMissingWebXml> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>${endorsed.dir}</outputDirectory> - <silent>true</silent> - <artifactItems> - <artifactItem> - <groupId>javax</groupId> - <artifactId>javaee-endorsed-api</artifactId> - <version>6.0</version> - <type>jar</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.superbiz</groupId> + <artifactId>bval-evaluation-redeployment</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + + <artifactId>WebApp1</artifactId> + <packaging>war</packaging> + + <name>WebApp1</name> + + <properties> + <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.tomee</groupId> + <artifactId>javaee-api</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </dependency> + <dependency> + <groupId>org.apache.tomee</groupId> + <artifactId>openejb-cxf-rs</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.7</source> + <target>1.7</target> + <compilerArguments> + <endorseddirs>${endorsed.dir}</endorseddirs> + </compilerArguments> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <failOnMissingWebXml>false</failOnMissingWebXml> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${endorsed.dir}</outputDirectory> + <silent>true</silent> + <artifactItems> + <artifactItem> + <groupId>javax</groupId> + <artifactId>javaee-endorsed-api</artifactId> + <version>6.0</version> + <type>jar</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/examples/bval-evaluation-redeployment/WebApp2/pom.xml ---------------------------------------------------------------------- diff --git a/examples/bval-evaluation-redeployment/WebApp2/pom.xml b/examples/bval-evaluation-redeployment/WebApp2/pom.xml index bb2aba2..2c5b91c 100644 --- a/examples/bval-evaluation-redeployment/WebApp2/pom.xml +++ b/examples/bval-evaluation-redeployment/WebApp2/pom.xml @@ -1,97 +1,97 @@ -<?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/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.superbiz</groupId> - <artifactId>bval-evaluation-redeployment</artifactId> - <version>1.1.0-SNAPSHOT</version> - </parent> - - <artifactId>WebApp2</artifactId> - <packaging>war</packaging> - - <name>WebApp2</name> - - <properties> - <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.tomee</groupId> - <artifactId>javaee-api</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.jaxrs</groupId> - <artifactId>jackson-jaxrs-json-provider</artifactId> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.7</source> - <target>1.7</target> - <compilerArguments> - <endorseddirs>${endorsed.dir}</endorseddirs> - </compilerArguments> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <failOnMissingWebXml>false</failOnMissingWebXml> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <outputDirectory>${endorsed.dir}</outputDirectory> - <silent>true</silent> - <artifactItems> - <artifactItem> - <groupId>javax</groupId> - <artifactId>javaee-endorsed-api</artifactId> - <version>6.0</version> - <type>jar</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</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/xsd/maven-4.0.0.xsd";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.superbiz</groupId> + <artifactId>bval-evaluation-redeployment</artifactId> + <version>1.1.0-SNAPSHOT</version> + </parent> + + <artifactId>WebApp2</artifactId> + <packaging>war</packaging> + + <name>WebApp2</name> + + <properties> + <endorsed.dir>${project.build.directory}/endorsed</endorsed.dir> + </properties> + + <dependencies> + <dependency> + <groupId>org.apache.tomee</groupId> + <artifactId>javaee-api</artifactId> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.jaxrs</groupId> + <artifactId>jackson-jaxrs-json-provider</artifactId> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.7</source> + <target>1.7</target> + <compilerArguments> + <endorseddirs>${endorsed.dir}</endorseddirs> + </compilerArguments> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <failOnMissingWebXml>false</failOnMissingWebXml> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>validate</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <outputDirectory>${endorsed.dir}</outputDirectory> + <silent>true</silent> + <artifactItems> + <artifactItem> + <groupId>javax</groupId> + <artifactId>javaee-endorsed-api</artifactId> + <version>6.0</version> + <type>jar</type> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/examples/cdi-ejbcontext-jaas/pom.xml ---------------------------------------------------------------------- diff --git a/examples/cdi-ejbcontext-jaas/pom.xml b/examples/cdi-ejbcontext-jaas/pom.xml index 24d5836..e5b08f8 100644 --- a/examples/cdi-ejbcontext-jaas/pom.xml +++ b/examples/cdi-ejbcontext-jaas/pom.xml @@ -54,7 +54,7 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> + <artifactId>maven-compiler-plugin</artifactId> <version>3.2</version> <configuration> <source>1.7</source> http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/examples/cdi-produces-field/pom.xml ---------------------------------------------------------------------- diff --git a/examples/cdi-produces-field/pom.xml b/examples/cdi-produces-field/pom.xml index ac79a23..b6a94a1 100644 --- a/examples/cdi-produces-field/pom.xml +++ b/examples/cdi-produces-field/pom.xml @@ -1,97 +1,97 @@ -<?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. ---> - -<!-- $Rev: 1090810 $ $Date: 2011-04-10 07:49:26 -0700 (Sun, 10 Apr 2011) $ --> - -<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>org.superbiz</groupId> - <artifactId>cdi-produces-field</artifactId> - <packaging>jar</packaging> - <version>1.1.0-SNAPSHOT</version> - <name>OpenEJB :: Examples :: CDI-Field Producer</name> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <build> - <defaultGoal>install</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>3.2</version> - <configuration> - <source>1.7</source> - <target>1.7</target> - </configuration> - </plugin> - </plugins> - </build> - <repositories> - <repository> - <id>apache-m2-snapshot</id> - <name>Apache Snapshot Repository</name> - <url>https://repository.apache.org/content/groups/snapshots</url> - </repository> - </repositories> - <dependencies> - <dependency> - <groupId>org.apache.tomee</groupId> - <artifactId>javaee-api</artifactId> - <version>7.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.12</version> - <scope>test</scope> - </dependency> - - <!-- - The <scope>test</scope> guarantees that non of your runtime - code is dependent on any OpenEJB classes. - --> - <dependency> - <groupId>org.apache.tomee</groupId> - <artifactId>openejb-core</artifactId> - <version>7.0.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> - - <!-- - This section allows you to configure where to publish libraries for sharing. - It is not required and may be deleted. For more information see: - http://maven.apache.org/plugins/maven-deploy-plugin/ - --> - <distributionManagement> - <repository> - <id>localhost</id> - <url>file://${basedir}/target/repo/</url> - </repository> - <snapshotRepository> - <id>localhost</id> - <url>file://${basedir}/target/snapshot-repo/</url> - </snapshotRepository> - </distributionManagement> - -</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. +--> + +<!-- $Rev: 1090810 $ $Date: 2011-04-10 07:49:26 -0700 (Sun, 10 Apr 2011) $ --> + +<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>org.superbiz</groupId> + <artifactId>cdi-produces-field</artifactId> + <packaging>jar</packaging> + <version>1.1.0-SNAPSHOT</version> + <name>OpenEJB :: Examples :: CDI-Field Producer</name> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.2</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + </plugins> + </build> + <repositories> + <repository> + <id>apache-m2-snapshot</id> + <name>Apache Snapshot Repository</name> + <url>https://repository.apache.org/content/groups/snapshots</url> + </repository> + </repositories> + <dependencies> + <dependency> + <groupId>org.apache.tomee</groupId> + <artifactId>javaee-api</artifactId> + <version>7.0-SNAPSHOT</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + <scope>test</scope> + </dependency> + + <!-- + The <scope>test</scope> guarantees that non of your runtime + code is dependent on any OpenEJB classes. + --> + <dependency> + <groupId>org.apache.tomee</groupId> + <artifactId>openejb-core</artifactId> + <version>7.0.0-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + + <!-- + This section allows you to configure where to publish libraries for sharing. + It is not required and may be deleted. For more information see: + http://maven.apache.org/plugins/maven-deploy-plugin/ + --> + <distributionManagement> + <repository> + <id>localhost</id> + <url>file://${basedir}/target/repo/</url> + </repository> + <snapshotRepository> + <id>localhost</id> + <url>file://${basedir}/target/snapshot-repo/</url> + </snapshotRepository> + </distributionManagement> + +</project> + http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/examples/webservice-ws-with-resources-config/pom.xml ---------------------------------------------------------------------- diff --git a/examples/webservice-ws-with-resources-config/pom.xml b/examples/webservice-ws-with-resources-config/pom.xml index 16874ab..2207d96 100644 --- a/examples/webservice-ws-with-resources-config/pom.xml +++ b/examples/webservice-ws-with-resources-config/pom.xml @@ -53,7 +53,7 @@ <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> + <artifactId>maven-compiler-plugin</artifactId> <version>3.2</version> <configuration> <source>1.7</source> http://git-wip-us.apache.org/repos/asf/tomee/blob/eb7a8fc4/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml b/maven/tomee-webapp-archetype/src/main/resources/archetype-resources/pom.xml index 6c6cacb..64b833d 100644 --- 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 @@ -<?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> - <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> + <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>
