servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1392204 - in /servicemix/smx4/specs/trunk: ./ assembly/ assembly/src/ assembly/src/main/ assembly/src/main/descriptors/ src-assembly/ src-assembly/src/main/resources/assemblies/
Date Mon, 01 Oct 2012 04:30:48 GMT
Author: jbonofre
Date: Mon Oct  1 04:30:47 2012
New Revision: 1392204

URL: http://svn.apache.org/viewvc?rev=1392204&view=rev
Log:
[SMX4-1255] Create a global spec src distribution

Added:
    servicemix/smx4/specs/trunk/assembly/
    servicemix/smx4/specs/trunk/assembly/pom.xml
      - copied, changed from r1391757, servicemix/smx4/specs/trunk/src-assembly/pom.xml
    servicemix/smx4/specs/trunk/assembly/src/
    servicemix/smx4/specs/trunk/assembly/src/main/
    servicemix/smx4/specs/trunk/assembly/src/main/descriptors/
    servicemix/smx4/specs/trunk/assembly/src/main/descriptors/src.xml
Removed:
    servicemix/smx4/specs/trunk/src-assembly/pom.xml
    servicemix/smx4/specs/trunk/src-assembly/src/main/resources/assemblies/src-assembly.xml
Modified:
    servicemix/smx4/specs/trunk/pom.xml

Copied: servicemix/smx4/specs/trunk/assembly/pom.xml (from r1391757, servicemix/smx4/specs/trunk/src-assembly/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/assembly/pom.xml?p2=servicemix/smx4/specs/trunk/assembly/pom.xml&p1=servicemix/smx4/specs/trunk/src-assembly/pom.xml&r1=1391757&r2=1392204&rev=1392204&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/src-assembly/pom.xml (original)
+++ servicemix/smx4/specs/trunk/assembly/pom.xml Mon Oct  1 04:30:47 2012
@@ -1,5 +1,5 @@
 <?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/xsd/maven-4.0.0.xsd">
+<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">
 
     <!--
 
@@ -27,6 +27,32 @@
         <version>2.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>src-assembly</artifactId>
+    <groupId>org.apache.servicemix.specs</groupId>
+    <artifactId>apache-servicemix-specs</artifactId>
+    <packaging>pom</packaging>
+    <version>2.1-SNAPSHOT</version>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>src</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <descriptors>
+                                <descriptor>src/main/descriptors/src.xml</descriptor>
+                            </descriptors>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
 </project>
\ No newline at end of file

Added: servicemix/smx4/specs/trunk/assembly/src/main/descriptors/src.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/assembly/src/main/descriptors/src.xml?rev=1392204&view=auto
==============================================================================
--- servicemix/smx4/specs/trunk/assembly/src/main/descriptors/src.xml (added)
+++ servicemix/smx4/specs/trunk/assembly/src/main/descriptors/src.xml Mon Oct  1 04:30:47
2012
@@ -0,0 +1,39 @@
+<?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.
+-->
+<assembly>
+    <id>src</id>
+
+    <formats>
+        <format>tar.gz</format>
+        <format>zip</format>
+    </formats>
+
+    <fileSets>
+        <fileSet>
+            <directory>${basedir}/..</directory>
+            <outputDirectory>/</outputDirectory>
+            <excludes>
+                <exclude>**/target/**</exclude>
+                <exclude>**/eclipse-classes/**</exclude>
+                <exclude>**/*.i??</exclude>
+                <exclude>**/.idea/**</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+</assembly>
\ No newline at end of file

Modified: servicemix/smx4/specs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/specs/trunk/pom.xml?rev=1392204&r1=1392203&r2=1392204&view=diff
==============================================================================
--- servicemix/smx4/specs/trunk/pom.xml (original)
+++ servicemix/smx4/specs/trunk/pom.xml Mon Oct  1 04:30:47 2012
@@ -36,7 +36,6 @@
     <inceptionYear>2007</inceptionYear>
 
     <modules>
-        <module>src-assembly</module>
         <module>locator</module>
         <module>activator</module>
         <module>saaj-api-1.3</module>
@@ -65,6 +64,7 @@
         <module>java-persistence-api-2.0</module>
         <module>jsr303-api-1.0.0</module>
         <module>jcr-api-2.0</module>
+        <module>assembly</module>
     </modules>
 
     <scm>
@@ -264,32 +264,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.3</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.servicemix.bundles</groupId>
-                        <artifactId>src-assembly</artifactId>
-                        <version>1.0-SNAPSHOT</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>make-src-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptorRefs>
-                                <descriptorRef>src-assembly</descriptorRef>
-                            </descriptorRefs>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
@@ -394,38 +368,6 @@
             </build>
         </profile>
         <profile>
-            <id>setup.eclipse</id>
-            <modules>
-                <module>assembly</module>
-            </modules>
-            <properties>
-                <eclipse.workspace.dir>${basedir}/../workspace</eclipse.workspace.dir>
-            </properties>
-            <build>
-                <defaultGoal>eclipse:eclipse</defaultGoal>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-eclipse-plugin</artifactId>
-                        <version>2.5.1</version>
-                        <inherited>false</inherited>
-                        <executions>
-                            <execution>
-                                <id>setup.eclipse.workspace</id>
-                                <phase>process-test-sources</phase>
-                                <goals>
-                                    <goal>add-maven-repo</goal>
-                                </goals>
-                                <configuration>
-                                    <workspace>${eclipse.workspace.dir}</workspace>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
             <id>deploy</id>
             <build>
                 <defaultGoal>deploy</defaultGoal>



Mime
View raw message