Author: chirino
Date: Mon Jun 16 09:03:19 2008
New Revision: 668210
URL: http://svn.apache.org/viewvc?rev=668210&view=rev
Log:
moved stuff around so that we can bring in the maven archetype into this branch
Added:
servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc/
(with props)
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/
- copied from r668174,
servicemix/smx3/trunk/archetypes/servicemix-cxf-bc-service-unit/
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc/pom.xml
- copied, changed from r668174,
servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc/src/
- copied from r668174,
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/
Removed:
servicemix/components/bindings/servicemix-cxf-bc/trunk/src/
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/pom.xml
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml
Added: servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml?rev=668210&view=auto
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml (added)
+++ servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml Mon Jun 16
09:03:19 2008
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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";>
+<!--
+
+ 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.
+-->
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>components-pom</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-cxf-bc-pom</artifactId>
+ <version>3.3-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <name>ServiceMix :: CXF BC POM</name>
+ <description>Used to build the CXF BC component and it's Maven
Archetypes</description>
+
+ <prerequisites>
+ <maven>2.0.6</maven>
+ </prerequisites>
+
+ <properties>
+ <servicemix-version>3.2.1</servicemix-version>
+ <cxf-version>2.1.1-SNAPSHOT</cxf-version>
+ <jetty-version>6.1.6</jetty-version>
+ <spring-version>2.0.6</spring-version>
+ <derby-version>10.2.2.0</derby-version>
+
+ <surefire.fork.mode>pertest</surefire.fork.mode>
+ <jaxb.version>2.1</jaxb.version>
+ <jaxb.impl.version>2.1.4</jaxb.impl.version>
+ <jaxb.xjc.version>2.1.4</jaxb.xjc.version>
+ </properties>
+
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-bean/trunk</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-bean/trunk</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/servicemix/components/engines/servicemix-bean/trunk</url>
+ </scm>
+
+ <modules>
+ <module>servicemix-cxf-bc</module>
+ <module>servicemix-cxf-bc-service-unit</module>
+ </modules>
+
+</project>
Propchange:
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jun 16 09:03:19 2008
@@ -0,0 +1,8 @@
+.classpath
+.project
+target
+.ruleset
+.checkstyle
+.pmd
+.settings
+
Propchange:
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc/
------------------------------------------------------------------------------
--- svnmerge-integrated (added)
+++ svnmerge-integrated Mon Jun 16 09:03:19 2008
@@ -0,0 +1 @@
+/servicemix/smx3/trunk/deployables/bindingcomponents/servicemix-cxf-bc:1-666757
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/pom.xml?rev=668210&r1=668174&r2=668210&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/pom.xml
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/pom.xml
Mon Jun 16 09:03:19 2008
@@ -23,12 +23,28 @@
<parent>
<groupId>org.apache.servicemix</groupId>
- <artifactId>archetypes</artifactId>
+ <artifactId>servicemix-cxf-bc-pom</artifactId>
<version>3.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>servicemix-cxf-bc-service-unit</artifactId>
+ <version>3.3-SNAPSHOT</version>
<name>ServiceMix :: Archetypes :: CxfBCServiceUnit</name>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>res-maven-plugin</artifactId>
+ <configuration>
+ <filters>
+
<component-version>${pom.version}</component-version>
+ </filters>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified:
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml?rev=668210&r1=668174&r2=668210&view=diff
==============================================================================
---
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml
(original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc-service-unit/src/main/resources/archetype-resources/pom.xml
Mon Jun 16 09:03:19 2008
@@ -26,17 +26,17 @@
<version>${version}</version>
<name>A Cxf BC Service Unit</name>
<url>http://www.myorganization.org</url>
+
@{repositories}
- <properties>
- <servicemix-version>@{servicemix-version}</servicemix-version>
- </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-cxf-bc</artifactId>
- <version>${servicemix-version}</version>
+ <version>@{component-version}</version>
</dependency>
</dependencies>
+
<build>
<resources>
<resource>
@@ -50,7 +50,7 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>jbi-maven-plugin</artifactId>
- <version>${servicemix-version}</version>
+ <version>@{jbi-maven-plugin-version}</version>
<extensions>true</extensions>
</plugin>
</plugins>
Copied:
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc/pom.xml
(from r668174, servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml)
URL:
http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc/pom.xml?p2=servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc/pom.xml&p1=servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml&r1=668174&r2=668210&rev=668210&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-cxf-bc/trunk/pom.xml (original)
+++
servicemix/components/bindings/servicemix-cxf-bc/trunk/servicemix-cxf-bc/pom.xml
Mon Jun 16 09:03:19 2008
@@ -21,8 +21,8 @@
<parent>
<groupId>org.apache.servicemix</groupId>
- <artifactId>components-pom</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <artifactId>servicemix-cxf-bc-pom</artifactId>
+ <version>3.3-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix</groupId>
@@ -32,26 +32,7 @@
<name>ServiceMix :: CXF Binding Component</name>
<description>A CXF Binding Component</description>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/components/bindings/servicemix-cxf-bc/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/components/bindings/servicemix-cxf-bc/trunk</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/servicemix/components/bindings/servicemix-cxf-bc/trunk</url>
- </scm>
-
- <properties>
- <servicemix-version>3.2.1</servicemix-version>
- <cxf-version>2.1.1-SNAPSHOT</cxf-version>
- <jetty-version>6.1.6</jetty-version>
- <spring-version>2.0.6</spring-version>
- <derby-version>10.2.2.0</derby-version>
- <surefire.fork.mode>pertest</surefire.fork.mode>
- <jaxb.version>2.1</jaxb.version>
- <jaxb.impl.version>2.1.4</jaxb.impl.version>
- <jaxb.xjc.version>2.1.4</jaxb.xjc.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.servicemix</groupId>
