Author: dkulp
Date: Tue Dec 4 20:56:04 2012
New Revision: 1417167
URL: http://svn.apache.org/viewvc?rev=1417167&view=rev
Log:
Merged revisions 1414390 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1414390 | dkulp | 2012-11-27 15:34:37 -0500 (Tue, 27 Nov 2012) | 2 lines
Use standard maven layout
........
Added:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
- copied, changed from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java
- copied, changed from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/UTPasswordCallback.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/common/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/common/ConciseFormatter.java
- copied, changed from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/common/ConciseFormatter.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/GreeterImpl.java
- copied, changed from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
- copied, changed from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java
- copied, changed from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/UTPasswordCallback.java
Removed:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/UTPasswordCallback.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/common/ConciseFormatter.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/UTPasswordCallback.java
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml?rev=1417167&r1=1417166&r2=1417167&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/pom.xml
Tue Dec 4 20:56:04 2012
@@ -34,7 +34,6 @@
<cxf.version>${project.version}</cxf.version>
</properties>
<build>
- <sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
Copied:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java
(from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java?p2=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/Client.java&p1=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/Client.java&r1=1417166&r2=1417167&rev=1417167&view=diff
==============================================================================
(empty)
Copied:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java
(from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/UTPasswordCallback.java)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java?p2=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/client/UTPasswordCallback.java&p1=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/client/UTPasswordCallback.java&r1=1417166&r2=1417167&rev=1417167&view=diff
==============================================================================
(empty)
Copied:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/common/ConciseFormatter.java
(from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/common/ConciseFormatter.java)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/common/ConciseFormatter.java?p2=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/common/ConciseFormatter.java&p1=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/common/ConciseFormatter.java&r1=1417166&r2=1417167&rev=1417167&view=diff
==============================================================================
(empty)
Copied:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/GreeterImpl.java
(from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/GreeterImpl.java?p2=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/GreeterImpl.java&p1=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/GreeterImpl.java&r1=1417166&r2=1417167&rev=1417167&view=diff
==============================================================================
(empty)
Copied:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java
(from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java?p2=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/Server.java&p1=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/Server.java&r1=1417166&r2=1417167&rev=1417167&view=diff
==============================================================================
(empty)
Copied:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java
(from r1417166,
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/UTPasswordCallback.java)
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java?p2=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/java/demo/wssec/server/UTPasswordCallback.java&p1=cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut/src/main/demo/wssec/server/UTPasswordCallback.java&r1=1417166&r2=1417167&rev=1417167&view=diff
==============================================================================
(empty)
Modified:
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml?rev=1417167&r1=1417166&r2=1417167&view=diff
==============================================================================
---
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml
(original)
+++
cxf/branches/2.6.x-fixes/distribution/src/main/release/samples/ws_security/ut_policy/pom.xml
Tue Dec 4 20:56:04 2012
@@ -35,7 +35,6 @@
<cxf.version>${project.version}</cxf.version>
</properties>
<build>
- <sourceDirectory>src</sourceDirectory>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
