You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2010/11/11 12:50:40 UTC

svn commit: r1033898 - in /axis/axis2/java/core/trunk: ./ modules/distribution/ modules/tool/axis2-eclipse-codegen-plugin/ modules/tool/axis2-eclipse-service-plugin/ modules/tool/axis2-idea-plugin/ src/main/assembly/

Author: veithen
Date: Thu Nov 11 11:50:40 2010
New Revision: 1033898

URL: http://svn.apache.org/viewvc?rev=1033898&view=rev
Log:
Added some maven-(install|deploy|assembly)-plugin magic so that during the release process, it automatically builds the directory structure that needs to be uploaded to /www/www.apache.org/dist/axis/axis2/java/core/ on minotaur.

Added:
    axis/axis2/java/core/trunk/src/main/assembly/dists.xml   (with props)
Modified:
    axis/axis2/java/core/trunk/modules/distribution/pom.xml
    axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
    axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
    axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
    axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
    axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml
    axis/axis2/java/core/trunk/pom.xml
    axis/axis2/java/core/trunk/src/main/assembly/jar.xml

Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1033898&r1=1033897&r2=1033898&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Thu Nov 11 11:50:40 2010
@@ -306,4 +306,19 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <configuration>
+                            <createChecksum>true</createChecksum>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml?rev=1033898&r1=1033897&r2=1033898&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml Thu Nov 11 11:50:40 2010
@@ -18,7 +18,7 @@
   -->
 
 <assembly>
-    <id>axis2-eclipse-codege-plugin</id>
+    <id>dist</id>
     <includeBaseDirectory>false</includeBaseDirectory>
     <formats>
         <format>zip</format>

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=1033898&r1=1033897&r2=1033898&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Thu Nov 11 11:50:40 2010
@@ -240,6 +240,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <configuration>
+                            <createChecksum>true</createChecksum>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml?rev=1033898&r1=1033897&r2=1033898&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml Thu Nov 11 11:50:40 2010
@@ -18,7 +18,7 @@
   -->
 
 <assembly>
-    <id>axis2-eclipse-service-plugin</id>
+    <id>dist</id>
     <includeBaseDirectory>false</includeBaseDirectory>
     <formats>
         <format>zip</format>

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=1033898&r1=1033897&r2=1033898&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml Thu Nov 11 11:50:40 2010
@@ -217,6 +217,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <configuration>
+                            <createChecksum>true</createChecksum>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml?rev=1033898&r1=1033897&r2=1033898&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml Thu Nov 11 11:50:40 2010
@@ -188,6 +188,27 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-install-plugin</artifactId>
+                        <configuration>
+                            <createChecksum>true</createChecksum>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1033898&r1=1033897&r2=1033898&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Thu Nov 11 11:50:40 2010
@@ -194,6 +194,7 @@
                                 <configuration>
                                     <descriptors>
                                         <descriptor>src/main/assembly/doc.xml</descriptor>
+                                        <descriptor>src/main/assembly/dists.xml</descriptor>
                                     </descriptors>
                                 </configuration>
                             </execution>
@@ -545,7 +546,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>2.2-beta-5</version>
+                    <version>2.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

Added: axis/axis2/java/core/trunk/src/main/assembly/dists.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/main/assembly/dists.xml?rev=1033898&view=auto
==============================================================================
--- axis/axis2/java/core/trunk/src/main/assembly/dists.xml (added)
+++ axis/axis2/java/core/trunk/src/main/assembly/dists.xml Thu Nov 11 11:50:40 2010
@@ -0,0 +1,103 @@
+<?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>dists</id>
+    <formats>
+        <format>dir</format>
+    </formats>
+    <baseDirectory>${project.version}</baseDirectory>
+    <files>
+        <!-- Standard binary distribution -->
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/distribution/${project.version}/distribution-${project.version}-bin.zip</source>
+            <destName>axis2-${project.version}-bin.zip</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/distribution/${project.version}/distribution-${project.version}-bin.zip.md5</source>
+            <destName>axis2-${project.version}-bin.zip.md5</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/distribution/${project.version}/distribution-${project.version}-bin.zip.asc</source>
+            <destName>axis2-${project.version}-bin.zip.asc</destName>
+        </file>
+        <!-- Source distribution -->
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/distribution/${project.version}/distribution-${project.version}-src.zip</source>
+            <destName>axis2-${project.version}-src.zip</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/distribution/${project.version}/distribution-${project.version}-src.zip.md5</source>
+            <destName>axis2-${project.version}-src.zip.md5</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/distribution/${project.version}/distribution-${project.version}-src.zip.asc</source>
+            <destName>axis2-${project.version}-src.zip.asc</destName>
+        </file>
+        <!-- WAR distribution -->
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/distribution/${project.version}/distribution-${project.version}-war.zip</source>
+            <destName>axis2-${project.version}-war.zip</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/distribution/${project.version}/distribution-${project.version}-war.zip.md5</source>
+            <destName>axis2-${project.version}-war.zip.md5</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/distribution/${project.version}/distribution-${project.version}-war.zip.asc</source>
+            <destName>axis2-${project.version}-war.zip.asc</destName>
+        </file>
+        <!-- Eclipse codegen plugin -->
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/axis2.eclipse.codegen.plugin/${project.version}/axis2.eclipse.codegen.plugin-${project.version}-dist.zip</source>
+            <destName>axis2-eclipse-codegen-plugin-${project.version}.zip</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/axis2.eclipse.codegen.plugin/${project.version}/axis2.eclipse.codegen.plugin-${project.version}-dist.zip.md5</source>
+            <destName>axis2-eclipse-codegen-plugin-${project.version}.zip.md5</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/axis2.eclipse.codegen.plugin/${project.version}/axis2.eclipse.codegen.plugin-${project.version}-dist.zip.asc</source>
+            <destName>axis2-eclipse-codegen-plugin-${project.version}.zip.asc</destName>
+        </file>
+        <!-- Eclipse service archiver plugin -->
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/axis2.eclipse.service.plugin/${project.version}/axis2.eclipse.service.plugin-${project.version}-dist.zip</source>
+            <destName>axis2-eclipse-service-plugin-${project.version}.zip</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/axis2.eclipse.service.plugin/${project.version}/axis2.eclipse.service.plugin-${project.version}-dist.zip.md5</source>
+            <destName>axis2-eclipse-service-plugin-${project.version}.zip.md5</destName>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/axis2.eclipse.service.plugin/${project.version}/axis2.eclipse.service.plugin-${project.version}-dist.zip.asc</source>
+            <destName>axis2-eclipse-service-plugin-${project.version}.zip.asc</destName>
+        </file>
+        <!-- IDEA plugin -->
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/axis2-idea-plugin/${project.version}/axis2-idea-plugin-${project.version}.zip</source>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/axis2-idea-plugin/${project.version}/axis2-idea-plugin-${project.version}.zip.md5</source>
+        </file>
+        <file>
+            <source>${settings.localRepository}/org/apache/axis2/axis2-idea-plugin/${project.version}/axis2-idea-plugin-${project.version}.zip.asc</source>
+        </file>
+    </files>
+</assembly>
\ No newline at end of file

Propchange: axis/axis2/java/core/trunk/src/main/assembly/dists.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: axis/axis2/java/core/trunk/src/main/assembly/jar.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/src/main/assembly/jar.xml?rev=1033898&r1=1033897&r2=1033898&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/src/main/assembly/jar.xml (original)
+++ axis/axis2/java/core/trunk/src/main/assembly/jar.xml Thu Nov 11 11:50:40 2010
@@ -18,6 +18,7 @@
   ~ under the License.
   -->
 <assembly>
+    <id>jar</id>
     <includeBaseDirectory>false</includeBaseDirectory>
     <formats>
         <format>jar</format>
@@ -41,7 +42,6 @@
             </includes>
             <binaries>
                 <includeDependencies>false</includeDependencies>
-                <useStrictFiltering>true</useStrictFiltering>
                 <unpack>true</unpack>
                 <unpackOptions>
                     <excludes>
@@ -59,7 +59,6 @@
             </includes>
             <binaries>
                 <includeDependencies>false</includeDependencies>
-                <useStrictFiltering>true</useStrictFiltering>
                 <attachmentClassifier>classpath-module</attachmentClassifier>
                 <unpack>true</unpack>
                 <unpackOptions>