Modified: tomee/tomee/trunk/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java
(original)
+++ tomee/tomee/trunk/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java
Wed Aug 21 13:09:35 2013
@@ -59,8 +59,8 @@ public class InheritanceTest extends Tes
//START SNIPPET: webservice
public void testInheritanceViaWsInterface() throws Exception {
Service service = Service.create(
- new URL("http://127.0.0.1:4204/webservice-inheritance/WakeRiderImpl?wsdl"),
- new QName("http://superbiz.org/wsdl", "InheritanceWsService"));
+ new URL("http://127.0.0.1:4204/webservice-inheritance/WakeRiderImpl?wsdl"),
+ new QName("http://superbiz.org/wsdl", "InheritanceWsService"));
assertNotNull(service);
WakeRiderWs ws = service.getPort(WakeRiderWs.class);
@@ -75,7 +75,6 @@ public class InheritanceTest extends Tes
ws.addItem(wakeBoard);
ws.addItem(wakeBoardbinding);
-
List<Item> returnedItems = ws.getItems();
assertEquals("testInheritanceViaWsInterface, nb Items", 4, returnedItems.size());
Modified: tomee/tomee/trunk/examples/webservice-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-security/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-security/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-security/pom.xml Wed Aug 21 13:09:35 2013
@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/webservice-security/src/main/java/org/superbiz/calculator/CalculatorImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-security/src/main/java/org/superbiz/calculator/CalculatorImpl.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-security/src/main/java/org/superbiz/calculator/CalculatorImpl.java
(original)
+++ tomee/tomee/trunk/examples/webservice-security/src/main/java/org/superbiz/calculator/CalculatorImpl.java
Wed Aug 21 13:09:35 2013
@@ -31,10 +31,10 @@ import javax.jws.WebService;
@DeclareRoles(value = {"Administrator"})
@Stateless
@WebService(
- portName = "CalculatorPort",
- serviceName = "CalculatorWsService",
- targetNamespace = "http://superbiz.org/wsdl",
- endpointInterface = "org.superbiz.calculator.CalculatorWs")
+ portName = "CalculatorPort",
+ serviceName = "CalculatorWsService",
+ targetNamespace = "http://superbiz.org/wsdl",
+ endpointInterface = "org.superbiz.calculator.CalculatorWs")
public class CalculatorImpl implements CalculatorWs, CalculatorRemote {
@RolesAllowed(value = {"Administrator"})
Modified: tomee/tomee/trunk/examples/webservice-ws-security/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-security/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-security/pom.xml (original)
+++ tomee/tomee/trunk/examples/webservice-ws-security/pom.xml Wed Aug 21 13:09:35 2013
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>javaee-api</artifactId>
- <version>6.0-4</version>
+ <version>6.0-5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: tomee/tomee/trunk/examples/webservice-ws-security/src/main/java/org/superbiz/calculator/CalculatorImpl.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-security/src/main/java/org/superbiz/calculator/CalculatorImpl.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-security/src/main/java/org/superbiz/calculator/CalculatorImpl.java
(original)
+++ tomee/tomee/trunk/examples/webservice-ws-security/src/main/java/org/superbiz/calculator/CalculatorImpl.java
Wed Aug 21 13:09:35 2013
@@ -31,10 +31,10 @@ import javax.jws.WebService;
@DeclareRoles(value = {"Administrator"})
@Stateless
@WebService(
- portName = "CalculatorPort",
- serviceName = "CalculatorWsService",
- targetNamespace = "http://superbiz.org/wsdl",
- endpointInterface = "org.superbiz.calculator.CalculatorWs")
+ portName = "CalculatorPort",
+ serviceName = "CalculatorWsService",
+ targetNamespace = "http://superbiz.org/wsdl",
+ endpointInterface = "org.superbiz.calculator.CalculatorWs")
public class CalculatorImpl implements CalculatorWs, CalculatorRemote {
@Override
Modified: tomee/tomee/trunk/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml
(original)
+++ tomee/tomee/trunk/examples/webservice-ws-security/src/main/resources/META-INF/webservices.xml
Wed Aug 21 13:09:35 2013
@@ -17,7 +17,7 @@
<webservices xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- xmlns:ger="http://ciaows.org/wsdl" version="1.1">
+ version="1.1">
<webservice-description>
<webservice-description-name>CalculatorWsService</webservice-description-name>
Modified: tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CustomPasswordHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CustomPasswordHandler.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CustomPasswordHandler.java
(original)
+++ tomee/tomee/trunk/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CustomPasswordHandler.java
Wed Aug 21 13:09:35 2013
@@ -24,6 +24,7 @@ import javax.security.auth.callback.Unsu
import java.io.IOException;
public class CustomPasswordHandler implements CallbackHandler {
+
@Override
public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
Propchange: tomee/tomee/trunk/examples/webservice-ws-with-resources-config/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/Calculator.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/Calculator.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/Calculator.java
(original)
+++ tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/Calculator.java
Wed Aug 21 13:09:35 2013
@@ -20,5 +20,6 @@ import javax.jws.WebService;
@WebService
public interface Calculator {
+
int add(int op1, int op2);
}
Modified: tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/CalculatorBean.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/CalculatorBean.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/CalculatorBean.java
(original)
+++ tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/CalculatorBean.java
Wed Aug 21 13:09:35 2013
@@ -22,6 +22,7 @@ import javax.jws.WebService;
@Singleton
@WebService
public class CalculatorBean implements Calculator {
+
@Override
public int add(int op1, int op2) {
return op1 + op2;
Modified: tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/PasswordCallbackHandler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/PasswordCallbackHandler.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/PasswordCallbackHandler.java
(original)
+++ tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/main/java/org/superbiz/ws/security/PasswordCallbackHandler.java
Wed Aug 21 13:09:35 2013
@@ -24,6 +24,7 @@ import javax.security.auth.callback.Unsu
import java.io.IOException;
public class PasswordCallbackHandler implements CallbackHandler {
+
private static boolean called = false;
@Override
Modified: tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/test/java/org/superbiz/ws/security/CalculatorTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/test/java/org/superbiz/ws/security/CalculatorTest.java?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/test/java/org/superbiz/ws/security/CalculatorTest.java
(original)
+++ tomee/tomee/trunk/examples/webservice-ws-with-resources-config/src/test/java/org/superbiz/ws/security/CalculatorTest.java
Wed Aug 21 13:09:35 2013
@@ -41,6 +41,7 @@ import static org.junit.Assert.assertTru
import static org.junit.matchers.JUnitMatchers.containsString;
public class CalculatorTest {
+
@Test
public void call() throws MalformedURLException {
final EJBContainer container = EJBContainer.createEJBContainer(new Properties() {{
@@ -50,23 +51,23 @@ public class CalculatorTest {
// normal call
final Service service = Service.create(
- new URL("http://127.0.0.1:4204/webservice-ws-with-resources-config/CalculatorBean?wsdl"),
- new QName("http://security.ws.superbiz.org/", "CalculatorBeanService"));
+ new URL("http://127.0.0.1:4204/webservice-ws-with-resources-config/CalculatorBean?wsdl"),
+ new QName("http://security.ws.superbiz.org/",
"CalculatorBeanService"));
final Calculator calculator = service.getPort(Calculator.class);
ClientProxy.getClient(calculator).getOutInterceptors().add(
- new WSS4JOutInterceptor(new HashMap<String, Object>() {{
- put("action", "UsernameToken");
- put("user", "openejb");
- put("passwordType", "PasswordText");
- put("passwordCallbackRef", new CallbackHandler() {
- @Override
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
- final WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
- pc.setPassword("tomee");
- }
- });
- }}));
+ new WSS4JOutInterceptor(new
HashMap<String, Object>() {{
+ put("action", "UsernameToken");
+ put("user", "openejb");
+ put("passwordType",
"PasswordText");
+ put("passwordCallbackRef",
new CallbackHandler() {
+ @Override
+ public void
handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ final WSPasswordCallback
pc = (WSPasswordCallback) callbacks[0];
+ pc.setPassword("tomee");
+ }
+ });
+ }}));
assertEquals(5, calculator.add(2, 3));
@@ -74,18 +75,18 @@ public class CalculatorTest {
final Calculator calculator2 = service.getPort(Calculator.class);
ClientProxy.getClient(calculator2).getOutInterceptors().add(
- new WSS4JOutInterceptor(new HashMap<String, Object>() {{
- put("action", "UsernameToken");
- put("user", "openejb");
- put("passwordType", "PasswordText");
- put("passwordCallbackRef", new CallbackHandler() {
- @Override
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException
{
- final WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
- pc.setPassword("wrong");
- }
- });
- }}));
+ new WSS4JOutInterceptor(new
HashMap<String, Object>() {{
+ put("action",
"UsernameToken");
+ put("user", "openejb");
+ put("passwordType",
"PasswordText");
+ put("passwordCallbackRef",
new CallbackHandler() {
+ @Override
+ public void
handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
+ final
WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
+ pc.setPassword("wrong");
+ }
+ });
+ }}));
try {
assertEquals(5, calculator2.add(2, 3));
Propchange: tomee/tomee/trunk/itests/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -7,3 +7,4 @@
target
.idea
+*.uml
Propchange: tomee/tomee/trunk/maven/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,3 @@
target
+.idea
+*.iml
Propchange: tomee/tomee/trunk/maven/jarstxt-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/maven/maven-util/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/maven/openejb-embedded-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/maven/tomee-embedded-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/maven/tomee-embedded-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/maven/tomee-embedded-maven-plugin/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/maven/tomee-embedded-maven-plugin/pom.xml (original)
+++ tomee/tomee/trunk/maven/tomee-embedded-maven-plugin/pom.xml Wed Aug 21 13:09:35 2013
@@ -45,6 +45,12 @@
<groupId>org.apache.openejb</groupId>
<artifactId>tomee-embedded</artifactId>
<version>${tomee.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.openejb.maven</groupId>
Propchange: tomee/tomee/trunk/maven/tomee-maven-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/maven/tomee-webapp-archetype/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Wed Aug 21 13:09:35 2013
@@ -92,9 +92,9 @@
<openejb.version>4.6.0-SNAPSHOT</openejb.version>
<tomee.version>1.6.0-SNAPSHOT</tomee.version>
-
- <openjpa.version>2.3.0-SNAPSHOT</openjpa.version>
- <org.apache.openwebbeans.version>1.2.1-SNAPSHOT</org.apache.openwebbeans.version>
+
+ <openjpa.version>2.3.0-SNAPSHOT</openjpa.version>
+ <org.apache.openwebbeans.version>1.2.1-SNAPSHOT</org.apache.openwebbeans.version>
<!-- Maven module versions -->
<maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
@@ -131,10 +131,10 @@
<jetty.version>7.5.3.v20111011</jetty.version>
<pax-url.version>1.3.5</pax-url.version>
<aether.version>1.13.1</aether.version>
- <maven.version>3.0.4</maven.version>
+ <maven.version>3.0.5</maven.version>
<wagon.version>2.2</wagon.version>
<plexus.version>1.5.5</plexus.version>
- <plexus-utils.version>2.0.6</plexus-utils.version>
+ <plexus-utils.version>3.0.10</plexus-utils.version>
<!--
- http://docs.codehaus.org/display/MAVENUSER/POM+Element+for+Source+File+Encoding
@@ -147,7 +147,7 @@
<org.springframework.version>3.1.3.RELEASE</org.springframework.version>
<junit.version>4.11</junit.version>
<org.apache.axis2.version>1.4.1</org.apache.axis2.version>
- <scannotation.version>1.0.2</scannotation.version>
+ <scannotation.version>1.0.2</scannotation.version>
<geronimo.connector.version>3.1.1</geronimo.connector.version>
<geronimo-osgi.version>1.1</geronimo-osgi.version>
<geronimo-javamail_1.4_spec.version>1.7.1</geronimo-javamail_1.4_spec.version>
@@ -155,7 +155,7 @@
<slf4j.version>1.7.5</slf4j.version>
<log4j.version>1.2.17</log4j.version>
<osgi.framework.version>4.2.0</osgi.framework.version>
- <hsqldb.version>2.2.8</hsqldb.version>
+ <hsqldb.version>2.2.9</hsqldb.version>
<!-- Apache Commons -->
<commons-beanutils.version>1.8.3</commons-beanutils.version>
@@ -172,6 +172,8 @@
<commons-lang.version>2.6</commons-lang.version>
<commons-io.version>1.4</commons-io.version>
<commons-net.version>3.2</commons-net.version>
+ <version.axiom>1.2.14</version.axiom>
+ <version.xalan>2.7.1</version.xalan>
</properties>
<build>
@@ -362,7 +364,7 @@
<module>container</module>
<module>server</module>
<module>assembly</module>
- <module>utils</module>
+ <module>utils</module>
</modules>
</profile>
<profile>
@@ -1145,12 +1147,12 @@
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
- <version>2.7.1</version>
+ <version>${version.xalan}</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>serializer</artifactId>
- <version>2.7.1</version>
+ <version>${version.xalan}</version>
</dependency>
<dependency>
<groupId>stax</groupId>
@@ -1354,7 +1356,7 @@
<dependency>
<groupId>org.codehaus.swizzle</groupId>
<artifactId>swizzle-stream</artifactId>
- <version>1.6.1</version>
+ <version>1.6.2</version>
</dependency>
<!-- <dependency>
<groupId>org.apache.openejb</groupId>
@@ -1436,7 +1438,7 @@
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>1.3.04</version>
+ <version>1.4.01</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1466,17 +1468,17 @@
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
- <version>1.2.12</version>
+ <version>${version.axiom}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-impl</artifactId>
- <version>1.2.12</version>
+ <version>${version.axiom}</version>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.9.1</version>
+ <version>2.11.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -1486,7 +1488,17 @@
<dependency>
<artifactId>serp</artifactId>
<groupId>net.sourceforge.serp</groupId>
- <version>1.13.1</version>
+ <version>1.14.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
+ <version>0.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>1.0</version>
</dependency>
<dependency>
<artifactId>slf4j-api</artifactId>
@@ -1664,7 +1676,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.3.1</version>
+ <version>6.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -1692,6 +1704,11 @@
<artifactId>ehcache-core</artifactId>
<version>${ehcache.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbynet</artifactId>
+ <version>10.9.1.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>
@@ -1705,7 +1722,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
<configuration>
<aggregate>true</aggregate>
<additionalJOption>-J-Xmx1024m</additionalJOption>
Propchange: tomee/tomee/trunk/server/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -9,3 +9,4 @@
bin
junit*.properties
target
+*.bat
Propchange: tomee/tomee/trunk/server/openejb-client/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -7,3 +7,4 @@
.project
.settings
target
+*.bat
Propchange: tomee/tomee/trunk/server/openejb-cxf/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -8,3 +8,4 @@
bin
junit*.properties
target
+.idea
Modified: tomee/tomee/trunk/server/openejb-derbynet/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-derbynet/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-derbynet/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-derbynet/pom.xml Wed Aug 21 13:09:35 2013
@@ -48,13 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>10.6.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
<artifactId>derbynet</artifactId>
- <version>10.6.1.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Propchange: tomee/tomee/trunk/server/openejb-ejbd/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -7,3 +7,5 @@
.project
.settings
target
+*.bat
+tmp
Propchange: tomee/tomee/trunk/server/openejb-hessian/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -0,0 +1,2 @@
+*.iml
+target
Propchange: tomee/tomee/trunk/server/openejb-server/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -6,3 +6,5 @@
.project
.settings
target
+.idea
+*.bat
Modified: tomee/tomee/trunk/server/openejb-ssh/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-ssh/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/server/openejb-ssh/pom.xml (original)
+++ tomee/tomee/trunk/server/openejb-ssh/pom.xml Wed Aug 21 13:09:35 2013
@@ -32,19 +32,17 @@
<dependencies>
<dependency>
- <groupId>org.apache.sshd</groupId>
- <artifactId>sshd-core</artifactId>
- <version>0.6.0</version>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>openejb-common-cli</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.sshd</groupId>
+ <artifactId>sshd-core</artifactId>
+ </dependency>
+ <dependency>
<groupId>jline</groupId>
<artifactId>jline</artifactId>
- <version>0.9.94</version>
</dependency>
<!-- dependencies we don't want to include in the zip -->
@@ -63,7 +61,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
Propchange: tomee/tomee/trunk/tck/cdi-embedded/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -2,3 +2,4 @@
.project
.settings
target
+*.iml
Propchange: tomee/tomee/trunk/tck/cdi-tomee/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -3,3 +3,5 @@
.settings
target
test-output
+data
+*.iml
Propchange: tomee/tomee/trunk/tomee/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -6,3 +6,4 @@
.project
.settings
target
+.idea
Modified: tomee/tomee/trunk/tomee/tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-embedded/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-embedded/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-embedded/pom.xml Wed Aug 21 13:09:35 2013
@@ -108,6 +108,17 @@
<artifactId>myfaces-impl</artifactId>
<version>${myfaces.version}</version>
<scope>compile</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ <version>1.8.3</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -164,7 +175,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.10</version>
<scope>test</scope>
</dependency>
@@ -209,7 +219,6 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.0.1</version>
<scope>test</scope>
</dependency>
</dependencies>
Propchange: tomee/tomee/trunk/tomee/tomee-jaxrs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/tomee/tomee-jaxrs-webapp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/tomee/tomee-jdbc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/tomee/tomee-mojarra/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/tomee/tomee-myfaces/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/tomee/tomee-myfaces/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-myfaces/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/tomee/tomee-myfaces/pom.xml (original)
+++ tomee/tomee/trunk/tomee/tomee-myfaces/pom.xml Wed Aug 21 13:09:35 2013
@@ -41,6 +41,12 @@
<artifactId>myfaces-impl</artifactId>
<version>${myfaces.version}</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>commons-beanutils</artifactId>
+ <groupId>commons-beanutils</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tomcat</groupId>
Propchange: tomee/tomee/trunk/tomee/tomee-util/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Propchange: tomee/tomee/trunk/utils/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,3 @@
target
+.idea
+*.iml
Modified: tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-core-hibernate/pom.xml Wed Aug 21 13:09:35 2013
@@ -65,6 +65,10 @@
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jboss-logging</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -76,6 +80,10 @@
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>jboss-logging</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Propchange: tomee/tomee/trunk/utils/openejb-mockito/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/utils/openejb-mockito/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-mockito/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-mockito/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-mockito/pom.xml Wed Aug 21 13:09:35 2013
@@ -39,6 +39,12 @@
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>1.9.0</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>hamcrest-core</artifactId>
+ <groupId>org.hamcrest</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
Propchange: tomee/tomee/trunk/utils/openejb-provisionning/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -1 +1,2 @@
target
+*.iml
Modified: tomee/tomee/trunk/utils/openejb-provisionning/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/utils/openejb-provisionning/pom.xml?rev=1516150&r1=1516149&r2=1516150&view=diff
==============================================================================
--- tomee/tomee/trunk/utils/openejb-provisionning/pom.xml (original)
+++ tomee/tomee/trunk/utils/openejb-provisionning/pom.xml Wed Aug 21 13:09:35 2013
@@ -66,16 +66,38 @@
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-connector-wagon</artifactId>
<version>${aether.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>plexus-utils</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>wagon-provider-api</artifactId>
+ <groupId>org.apache.maven.wagon</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<version>${maven.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>plexus-utils</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
<version>${wagon.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>plexus-utils</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
@@ -123,6 +145,14 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-reflect</artifactId>
</exclusion>
+ <exclusion>
+ <artifactId>plexus-utils</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>plexus-classworlds</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Propchange: tomee/tomee/trunk/utils/webdeployer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 21 13:09:35 2013
@@ -2,3 +2,4 @@
.project
.settings
target
+*.iml
|