This one is trivial, but long. I removed a section that was bundling
javahelp class files into the upgrade tool jar file. Other than that,
the changes are cosmetic (e.g., copyrights were missing on two of the
files).
Index: upgrade-jar/pom.xml
===================================================================
--- upgrade-jar/pom.xml (revision 31442)
+++ upgrade-jar/pom.xml (working copy)
@@ -1,3 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+*
+* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+*
+* The contents of this file are subject to the terms of either the GNU
+* General Public License Version 2 only ("GPL") or the Common
Development
+* and Distribution License("CDDL") (collectively, the "License"). You
+* may not use this file except in compliance with the License. You
can obtain
+* a copy of the License at
https://glassfish.dev.java.net/public/CDDL+GPL.html
+* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific
+* language governing permissions and limitations under the License.
+*
+* When distributing the software, include this License Header Notice
in each
+* file and include the License file at glassfish/bootstrap/legal/
LICENSE.txt.
+* Sun designates this particular file as subject to the "Classpath"
exception
+* as provided by Sun in the GPL Version 2 section of the License file
that
+* accompanied this code. If applicable, add the following below the
License
+* Header, with the fields enclosed by brackets [] replaced by your own
+* identifying information: "Portions Copyrighted [year]
+* [name of copyright owner]"
+*
+* Contributor(s):
+*
+* If you wish your version of this file to be governed by only the
CDDL or
+* only the GPL Version 2, indicate your decision by adding
"[Contributor]
+* elects to include this software in this distribution under the
[CDDL or GPL
+* Version 2] license." If you don't indicate a single choice of
license, a
+* recipient has the option to distribute your version of this file
under
+* either the CDDL, the GPL Version 2 or to extend the choice of
license to
+* its licensees as provided above. However, if you add GPL Version 2
code
+* and therefore, elected the GPL Version 2 license, then the option
applies
+* only if the new code is made subject to such option by the copyright
+* holder.
+*/
+-->
<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
">
<modelVersion>4.0.0</modelVersion>
@@ -11,28 +49,6 @@
<packaging>hk2-jar</packaging>
<name>Upgrade Tool</name>
- <developers>
- <developer>
- <id>rsearls</id>
- <name>Rebecca Searls</name>
- <url>
http://blogs.sun.com/searls</url>
- <organization>Sun Microsystems, Inc.</organization>
- <roles>
- <role>lead</role>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <id>bbissett</id>
- <name>Bobby Bissett</name>
- <url>
http://blogs.sun.com/bobby</url>
- <organization>Sun Microsystems, Inc.</organization>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
<build>
<finalName>upgrade-tool</finalName>
<resources>
@@ -52,32 +68,6 @@
</archive>
</configuration>
</plugin>
-
- <!-- Temp workaround to have access to JavaHelp APIs -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>Get JavaHelp classes</id>
- <phase>validate</phase>
- <configuration>
- <tasks>
- <unzip src="$
{project.build.directory}/../lib/javahelp-2.0.02.jar" dest="$
{project.build.outputDirectory}">
- <patternset>
- <exclude name="META-INF/*"/>
- </patternset>
- </unzip>
-
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
</plugins>
</build>
Index: pom.xml
===================================================================
--- pom.xml (revision 31442)
+++ pom.xml (working copy)
@@ -49,6 +49,20 @@
<artifactId>upgrade</artifactId>
<packaging>pom</packaging>
<name>GlassFish Upgrade Tool</name>
+
+ <developers>
+ <developer>
+ <id>bbissett</id>
+ <name>Bobby Bissett</name>
+ <url>
http://blogs.sun.com/bobby</url>
+ <organization>Sun Microsystems, Inc.</organization>
+ <roles>
+ <role>lead</role>
+ <role>developer</role>
+ </roles>
+ </developer>
+ </developers>
+
<modules>
<module>upgrade-jar</module>
<module>upgrade-scripts</module>
Property changes on: upgrade-scripts
___________________________________________________________________
Name: svn:ignore
+ target
Index: upgrade-scripts/pom.xml
===================================================================
--- upgrade-scripts/pom.xml (revision 31442)
+++ upgrade-scripts/pom.xml (working copy)
@@ -1,3 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+*
+* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+*
+* The contents of this file are subject to the terms of either the GNU
+* General Public License Version 2 only ("GPL") or the Common
Development
+* and Distribution License("CDDL") (collectively, the "License"). You
+* may not use this file except in compliance with the License. You
can obtain
+* a copy of the License at
https://glassfish.dev.java.net/public/CDDL+GPL.html
+* or glassfish/bootstrap/legal/LICENSE.txt. See the License for the
specific
+* language governing permissions and limitations under the License.
+*
+* When distributing the software, include this License Header Notice
in each
+* file and include the License file at glassfish/bootstrap/legal/
LICENSE.txt.
+* Sun designates this particular file as subject to the "Classpath"
exception
+* as provided by Sun in the GPL Version 2 section of the License file
that
+* accompanied this code. If applicable, add the following below the
License
+* Header, with the fields enclosed by brackets [] replaced by your own
+* identifying information: "Portions Copyrighted [year]
+* [name of copyright owner]"
+*
+* Contributor(s):
+*
+* If you wish your version of this file to be governed by only the
CDDL or
+* only the GPL Version 2, indicate your decision by adding
"[Contributor]
+* elects to include this software in this distribution under the
[CDDL or GPL
+* Version 2] license." If you don't indicate a single choice of
license, a
+* recipient has the option to distribute your version of this file
under
+* either the CDDL, the GPL Version 2 or to extend the choice of
license to
+* its licensees as provided above. However, if you add GPL Version 2
code
+* and therefore, elected the GPL Version 2 license, then the option
applies
+* only if the new code is made subject to such option by the copyright
+* holder.
+*/
+-->
<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
">
<modelVersion>4.0.0</modelVersion>
@@ -10,48 +48,9 @@
<artifactId>upgrade-scripts</artifactId>
<name>GlassFish upgrade scripts</name>
- <!--
- The comments below were copied from the appclient-scripts
module.
- They are very helpful so it seemed like a good idea to leave
them here also.
- -->
- <!--
- This packaging specifies that it's a package that contains
files to be added to
- the distribution.
-
- In this packaging mode, the build will produce a jar, like it
normally does for
- the <packaging>jar</packaging>, but the contents of this jar is
then extracted
- when the final GlassFish distribution is assembled. (But when
this happens,
- META-INF/** in the jar will be ignored.)
-
- For a fragment to be added to the distribution, the
distribution POM needs
- to directly or indirectly depend on the fragment module. This
is normally
- done by creating a feature-level grouping POM (which allows you
to bundle multiple
- modules and treat it as a single dependency - see the webtier-
all module for example),
- and have that declare a dependency on the fragment, instead of
directly
- modifying the distribution POM.
-
- So the idea here is that individual technology area will create
their own
- fragments that contain pieces that they need, and when the said
technology
- is bundled in GF, the corresponding fragment will be also
added, thanks to
- the transitive dependency handling in Maven.
- -->
-
<packaging>distribution-fragment</packaging>
-<!--
-
- <packaging>pom</packaging>
---> <build>
- <!--
- In this module, all the files are statically stored as-is in
the Subversion repository,
- so the simple copying from src/main/resources to target/
classes that Maven does by default
- is suffice.
-
- But in more complex scenario, one can use maven-antrun-
extended-plugin and use a series of Ant tasks
- to perform processing on resources, such as token
replacement, file generation, pre-processing, etc.
-
- The following section shows how you can do this.
- -->
+ <build>
<plugins>
<plugin>
<groupId>org.glassfish.build</groupId>