You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scout-dev@ws.apache.org by ks...@apache.org on 2009/07/28 04:04:17 UTC

svn commit: r798357 - in /webservices/scout/branches/v1.1: scout/pom.xml scout/src/site/ scout/src/site/resources/ scout/src/site/site.xml scout/src/site/xdoc/ src/site/resources/ src/site/xdoc/

Author: kstam
Date: Tue Jul 28 02:04:16 2009
New Revision: 798357

URL: http://svn.apache.org/viewvc?rev=798357&view=rev
Log:
SCOUT-82 working on upgrading maven build to nexus

Added:
    webservices/scout/branches/v1.1/scout/src/site/
    webservices/scout/branches/v1.1/scout/src/site/resources/   (props changed)
      - copied from r798210, webservices/scout/branches/v1.1/src/site/resources/
    webservices/scout/branches/v1.1/scout/src/site/site.xml
    webservices/scout/branches/v1.1/scout/src/site/xdoc/   (props changed)
      - copied from r798210, webservices/scout/branches/v1.1/src/site/xdoc/
Removed:
    webservices/scout/branches/v1.1/src/site/resources/
    webservices/scout/branches/v1.1/src/site/xdoc/
Modified:
    webservices/scout/branches/v1.1/scout/pom.xml

Modified: webservices/scout/branches/v1.1/scout/pom.xml
URL: http://svn.apache.org/viewvc/webservices/scout/branches/v1.1/scout/pom.xml?rev=798357&r1=798356&r2=798357&view=diff
==============================================================================
--- webservices/scout/branches/v1.1/scout/pom.xml (original)
+++ webservices/scout/branches/v1.1/scout/pom.xml Tue Jul 28 02:04:16 2009
@@ -8,8 +8,9 @@
         <artifactId>apache</artifactId>
         <version>6</version>
     </parent>
+    <groupId>org.apache.ws.scout</groupId>
     <artifactId>scout</artifactId>
-    <version>1.1</version>
+    <version>1.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Apache Scout</name>
@@ -19,122 +20,118 @@
     </description>
     <url>http://ws.apache.org/scout/</url>
     <issueManagement>
-      <system>JIRA</system>
-      <url>http://issues.apache.org/jira/browse/SCOUT</url>
+        <system>JIRA</system>
+        <url>http://issues.apache.org/jira/browse/SCOUT</url>
     </issueManagement>
     <ciManagement>
-      <system>Continuum</system>
-      <url>http://vmbuild.apache.org</url>
-      <notifiers>
-        <notifier>
-          <sendOnError>true</sendOnError>
-          <sendOnFailure>true</sendOnFailure>
-          <sendOnSuccess>true</sendOnSuccess>
-          <sendOnWarning>true</sendOnWarning>
-          <configuration>
-            <address>scout-dev@ws.apache.org</address>
-          </configuration>
-        </notifier>
-      </notifiers>
+        <system>Continuum</system>
+        <url>http://vmbuild.apache.org</url>
+        <notifiers>
+            <notifier>
+                <sendOnError>true</sendOnError>
+                <sendOnFailure>true</sendOnFailure>
+                <sendOnSuccess>true</sendOnSuccess>
+                <sendOnWarning>true</sendOnWarning>
+                <configuration>
+                    <address>scout-dev@ws.apache.org</address>
+                </configuration>
+            </notifier>
+        </notifiers>
     </ciManagement>
     <inceptionYear>2004</inceptionYear>
     <mailingLists>
-      <mailingList>
-        <name>WS Scout Developers</name>
-        <subscribe>scout-dev-subscribe@ws.apache.org</subscribe>
-        <unsubscribe>scout-dev-unsubscribe@ws.apache.org</unsubscribe>
-        <post>scout-dev@ws.apache.org</post>
-        <archive>http://mail-archives.apache.org/mod_mbox/ws-scout-dev/</archive>
-      </mailingList>
+        <mailingList>
+            <name>WS Scout Developers</name>
+            <subscribe>scout-dev-subscribe@ws.apache.org</subscribe>
+            <unsubscribe>scout-dev-unsubscribe@ws.apache.org</unsubscribe>
+            <post>scout-dev@ws.apache.org</post>
+            <archive>http://mail-archives.apache.org/mod_mbox/ws-scout-dev/</archive>
+        </mailingList>
     </mailingLists>
     <developers>
-      <developer>
-        <id>anil</id>
-        <name>Anil Saldhana</name>
-        <email>anil@apache.org</email>
-        <organization></organization>
-      </developer>
-      <developer>
-        <id>dims</id>
-        <name>Davanum Srinivas</name>
-        <email>dims@yahoo.com</email>
-        <organization></organization>
-      </developer>
-      <developer>
-        <id>kstam</id>
-        <name>Kurt T Stam</name>
-        <email>kstam@apache.org</email>
-        <organization></organization>
-      </developer>
-      <developer>
-        <id>jfaath</id>
-        <name>Jeff Faath</name>
-        <email>jfaath@apache.org</email>
-        <organization></organization>
-      </developer>
-      <developer>
-        <id>linsun</id>
-        <name>Lin Sun</name>
-        <email>linsun@apache.org</email>
-        <organization></organization>
-      </developer>
-      <developer>
-        <id>tcunning</id>
-        <name>Tom Cunningham</name>
-        <email>tcunning@apache.org</email>
-        <organization></organization>
-      </developer>
+        <developer>
+            <id>anil</id>
+            <name>Anil Saldhana</name>
+            <email>anil@apache.org</email>
+            <organization></organization>
+        </developer>
+        <developer>
+            <id>dims</id>
+            <name>Davanum Srinivas</name>
+            <email>dims@yahoo.com</email>
+            <organization></organization>
+        </developer>
+        <developer>
+            <id>kstam</id>
+            <name>Kurt T Stam</name>
+            <email>kstam@apache.org</email>
+            <organization></organization>
+        </developer>
+        <developer>
+            <id>jfaath</id>
+            <name>Jeff Faath</name>
+            <email>jfaath@apache.org</email>
+            <organization></organization>
+        </developer>
+        <developer>
+            <id>linsun</id>
+            <name>Lin Sun</name>
+            <email>linsun@apache.org</email>
+            <organization></organization>
+        </developer>
+        <developer>
+            <id>tcunning</id>
+            <name>Tom Cunningham</name>
+            <email>tcunning@apache.org</email>
+            <organization></organization>
+        </developer>
     </developers>
     <contributors>
-      <contributor>
-        <name>Deepack Bhole</name>
-        <email>dbhole@apache.org</email>
-        <organization></organization>
-      </contributor>
-      <contributor>
-        <name>Steve Viens</name>
-        <email>sviens@apache.org</email>
-        <organization></organization>
-      </contributor>
-      <contributor>
-        <name>David Jencks</name>
-        <email>djencks@apache.org</email>
-        <organization></organization>
-      </contributor>
-      <contributor>
-        <name>Jeremy Boynes</name>
-        <email>jboynes@apache.org</email>
-        <organization></organization>
-      </contributor>
-      <contributor>
-        <name>Jarek Gawor</name>
-        <email>gawor@apache.org</email>
-        <organization></organization>
-      </contributor>
-      <contributor>
-        <name>Geir Magnusson Jr.</name>
-        <email>geirm@apache.org</email>
-        <organization></organization>
-      </contributor>
+        <contributor>
+            <name>Deepack Bhole</name>
+            <email>dbhole@apache.org</email>
+            <organization></organization>
+        </contributor>
+        <contributor>
+            <name>Steve Viens</name>
+            <email>sviens@apache.org</email>
+            <organization></organization>
+        </contributor>
+        <contributor>
+            <name>David Jencks</name>
+            <email>djencks@apache.org</email>
+            <organization></organization>
+        </contributor>
+        <contributor>
+            <name>Jeremy Boynes</name>
+            <email>jboynes@apache.org</email>
+            <organization></organization>
+        </contributor>
+        <contributor>
+            <name>Jarek Gawor</name>
+            <email>gawor@apache.org</email>
+            <organization></organization>
+        </contributor>
+        <contributor>
+            <name>Geir Magnusson Jr.</name>
+            <email>geirm@apache.org</email>
+            <organization></organization>
+        </contributor>
     </contributors>
     <licenses>
-      <license>
-        <name>The Apache Software License, Version 2.0</name>
-        <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        <distribution>repo</distribution>
-      </license>
+        <license>
+            <name>The Apache Software License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
     </licenses>
     <scm>
-      <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/scout/branches/v1.1/</connection>
-      <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/scout/branches/v1.1/</developerConnection>
-      <url>http://svn.apache.org/viewcvs.cgi/webservices/scout/branches/v1.1/</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/webservices/scout/branches/v1.1/</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/webservices/scout/branches/v1.1/
+        </developerConnection>
+        <url>http://svn.apache.org/viewcvs.cgi/webservices/scout/branches/v1.1/</url>
     </scm>
     <dependencies>
-        <!--<dependency>-->
-            <!--<groupId>org.apache.ws.scout</groupId>-->
-            <!--<artifactId>jaxr-api</artifactId>-->
-            <!--<version>1.0</version>-->
-        <!--</dependency>-->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-activation_1.1_spec</artifactId>
@@ -143,7 +140,7 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
@@ -225,34 +222,49 @@
         </dependency>
 
         <dependency>
-          <groupId>junit</groupId>
-          <artifactId>junit</artifactId>
-          <version>4.5</version>
-          <scope>test</scope>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-          <groupId>org.apache.juddi</groupId>
-          <artifactId>juddi</artifactId>
-          <version>2.0rc7</version>
-          <scope>test</scope>
+            <groupId>org.apache.juddi</groupId>
+            <artifactId>juddi</artifactId>
+            <version>2.0rc7</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-          <groupId>org.apache.derby</groupId>
-          <artifactId>derby</artifactId>
-          <version>10.1.2.1</version>
-          <scope>test</scope>
+            <groupId>org.apache.derby</groupId>
+            <artifactId>derby</artifactId>
+            <version>10.1.2.1</version>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
-          <groupId>log4j</groupId>
-          <artifactId>log4j</artifactId>
-          <version>1.2.13</version>
-          <scope>test</scope>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.13</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <configuration>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <preparationGoals>clean install</preparationGoals>
+                        <goals>deploy</goals>
+                        <releaseProfiles>apache-release</releaseProfiles>
+                    </configuration>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -266,13 +278,13 @@
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <skip>false</skip>
                     <excludes>
                         <exclude>**/*Abstract*.java</exclude>
                     </excludes>
                     <includes>
                         <include>**/*Test.java</include>
                     </includes>
+                    <failIfNoTests>false</failIfNoTests>
                 </configuration>
             </plugin>
 
@@ -282,7 +294,7 @@
                 <version>2.0.0</version>
                 <extensions>true</extensions>
             </plugin>
-            
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>ianal-maven-plugin</artifactId>
@@ -292,9 +304,169 @@
         </plugins>
     </build>
     <distributionManagement>
-      <site>
-        <id>website</id>
-        <url>scpexe://people.apache.org/www/ws.apache.org/scout</url>
-      </site>
+        <site>
+            <id>website</id>
+            <url>scpexe://people.apache.org/www/ws.apache.org/scout</url>
+        </site>
     </distributionManagement>
+
+    <profiles>
+        <profile>
+            <id>apache-release</id>
+            <activation>
+                <property>
+                    <name>apache-release</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- waiting for release -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <phase>package</phase>
+                                <configuration>
+                                    <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot>
+                                    <descriptorRefs>
+                                        <descriptorRef>
+                                            source-release
+                                        </descriptorRef>
+                                    </descriptorRefs>
+                                </configuration>
+                            </execution>
+                        </executions>
+                        <dependencies>
+                            <dependency>
+                                <!-- apache version not yet released -->
+                                <!--<groupId>org.apache</groupId>-->
+                                <groupId>org.apache.geronimo.genesis</groupId>
+                                <artifactId>apache-source-release-assembly-descriptor</artifactId>
+                                <!-- apache version not yet known -->
+                                <version>2.0</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
+
+                </plugins>
+            </build>
+        </profile>
+
+    </profiles>
+
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.5</version>
+
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>javadoc</report>
+                            <report>test-javadoc</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+
+                <configuration>
+                    <quiet>true</quiet>
+                    <tags>
+                        <tag>
+                            <name>goal</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>phase</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>execute</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>requiresDependencyResolution</name>
+                            <placement>Xt</placement>
+                        </tag>
+                        <tag>
+                            <name>parameter</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>required</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>readonly</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>component</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>plexus.component</name>
+                            <placement>Xf</placement>
+                        </tag>
+                        <tag>
+                            <name>plexus.requirement</name>
+                            <placement>Xf</placement>
+                        </tag>
+                    </tags>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jxr-plugin</artifactId>
+                <version>2.1</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>2.4</version>
+                <configuration>
+                    <sourceEncoding>utf-8</sourceEncoding>
+                    <minimumTokens>100</minimumTokens>
+                    <targetJdk>1.5</targetJdk>
+                    <linkXRef>true</linkXRef>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-report-plugin</artifactId>
+                <version>2.4.3</version>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <quiet>true</quiet>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jdepend-maven-plugin</artifactId>
+                <version>2.0-beta-2</version>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>

Propchange: webservices/scout/branches/v1.1/scout/src/site/resources/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: webservices/scout/branches/v1.1/scout/src/site/site.xml
URL: http://svn.apache.org/viewvc/webservices/scout/branches/v1.1/scout/src/site/site.xml?rev=798357&view=auto
==============================================================================
--- webservices/scout/branches/v1.1/scout/src/site/site.xml (added)
+++ webservices/scout/branches/v1.1/scout/src/site/site.xml Tue Jul 28 02:04:16 2009
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~  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.
+  -->
+
+<project name="Apache Scout">
+
+    <bannerLeft>
+        <name>Apache Scout</name>
+        <src>images/project-logo.jpg</src>
+        <href>ws.apache.org/scout/</href>
+    </bannerLeft>
+    <bannerRight>
+        <src>images/scout.jpg</src>
+    </bannerRight>
+    <skin>
+        <groupId>org.apache.maven.skins</groupId>
+        <artifactId>maven-default-skin</artifactId>
+        <version>1.0</version>
+    </skin>
+
+    <publishDate format="dd MMM yyyy" position="right"/>
+
+    <body>
+        <breadcrumbs>
+            <item name="Apache" href="http://www.apache.org/"/>
+            <item name="WebServices" href="http://ws.apache.org/"/>
+            <item name="Scout" href="http://ws.apache.org/scout/"/>
+        </breadcrumbs>
+
+        <menu name="Apache Scout">
+            <item name="Welcome" href="http://ws.apache.org/scout/index.html"/>
+            <item name="Get Scout">
+                <item name="Releases" href="releases.html"/>
+                <item name="Source Code" href="source-repository.html"/>
+            </item>
+            <item name="Wiki" href="http://wiki.apache.org/ws/scout"/>
+        </menu>
+        <menu name="Related Projects">
+            <item name="Apache jUDDI" href="http://ws.apache.org/juddi/" description="Apache jUDDI"/>
+        </menu>
+        <menu ref="reports"/>
+
+    </body>
+</project>
+

Propchange: webservices/scout/branches/v1.1/scout/src/site/xdoc/
------------------------------------------------------------------------------
    svn:mergeinfo = 



---------------------------------------------------------------------
To unsubscribe, e-mail: scout-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: scout-dev-help@ws.apache.org