OK. That's what I thought. I'll sit tight.
On Jul 8, 2009, at 1:32 PM, Snjezana Sevo-Zenzerovic wrote:
> I would recommend that you also get Jane's blessing for the whole
> thing :-)
>
> Jason Lee wrote:
>
>> Nice. Thanks. Am I good to commit all of this then, or should I
>> wait for explicit POM change approval?
>>
>> On Jul 8, 2009, at 12:47 PM, Snjezana Sevo-Zenzerovic wrote:
>>
>>> Packager changes look fine.
>>>
>>> Thanks,
>>>
>>> Snjezana
>>>
>>> Jason Lee wrote:
>>>
>>>> Below is the full diff, which adds the JMS plugin to the admingui
>>>> parent pom, so it gets included in the build; updates the
>>>> packager POM so it gets included in the distribution, and moves
>>>> the JSF Extensions dependency from the Admin GUI parent POM to
>>>> the WAR pom, where it belongs, as well us updating to the build-
>>>> from-source version, a change that should have been committed
>>>> some time ago; and, finally, cleans up the packaging to remove
>>>> the references to the JSF Extensions dependency, which it no
>>>> longer sees. All QL tests pass locally with these changes:
>>>
>>>>
>>>> Index: pom.xml
>>>
>>>> ===================================================================
>>>
>>>> --- pom.xml (revision 28704)
>>>
>>>> +++ pom.xml (working copy)
>>>
>>>> @@ -106,6 +106,7 @@
>>>
>>>> <jstl-api.version>1.2</jstl-api.version>
>>>
>>>> <jsf-api.version>2.0.0-b13</jsf-api.version>
>>>
>>>> <jsf-impl.version>2.0.0-b13</jsf-impl.version>
>>>
>>>> + <jsf-ext.version>0.2</jsf-ext.version>
>>>
>>>> <deployment-api.version>1.2-rev-1</deployment-api.version>
>>>
>>>> <jaxrpc-api.version>1.1</jaxrpc-api.version>
>>>
>>>> <grizzly.version>1.9.15a</grizzly.version>
>>>
>>>> Index: packager/glassfish-web-gui/build.xml
>>>
>>>> ===================================================================
>>>
>>>> --- packager/glassfish-web-gui/build.xml (revision 28704)
>>>
>>>> +++ packager/glassfish-web-gui/build.xml (working copy)
>>>
>>>> @@ -130,7 +130,6 @@
>>>
>>>> <artifact groupID="com.sun.woodstock.dependlibs"
>>>> artifactId="dataprovider" />
>>>
>>>> <artifact groupID="com.sun.woodstock" artifactId="webui-jsf" />
>>>
>>>> <artifact groupID="com.sun.woodstock" artifactId="webui-jsf-
>>>> suntheme" />
>>>
>>>> - <artifact groupID="com.sun.jsftemplating"
>>>> artifactId="jsftemplating-dynafaces" />
>>>
>>>> </excludeArtifactsTransitively>
>>>
>>>> </resolveAll>
>>>
>>>> Index: packager/glassfish-gui/build.xml
>>>
>>>> ===================================================================
>>>
>>>> --- packager/glassfish-gui/build.xml (revision 28704)
>>>
>>>> +++ packager/glassfish-gui/build.xml (working copy)
>>>
>>>> @@ -127,7 +127,7 @@
>>>
>>>> <artifact groupID="com.sun.woodstock.dependlibs"
>>>> artifactId="dataprovider" />
>>>
>>>> <artifact groupID="com.sun.woodstock" artifactId="webui-jsf" />
>>>
>>>> <artifact groupID="com.sun.woodstock" artifactId="webui-jsf-
>>>> suntheme" />
>>>
>>>> - <artifact groupID="com.sun.jsftemplating"
>>>> artifactId="jsftemplating-dynafaces" />
>>>
>>>> +
>>>
>>>> </excludeArtifactsTransitively>
>>>
>>>> </resolveAll>
>>>
>>>> Index: packager/glassfish-jdbc-gui/build.xml
>>>
>>>> ===================================================================
>>>
>>>> --- packager/glassfish-jdbc-gui/build.xml (revision 28704)
>>>
>>>> +++ packager/glassfish-jdbc-gui/build.xml (working copy)
>>>
>>>> @@ -135,7 +135,6 @@
>>>
>>>> <artifact groupID="com.sun.woodstock.dependlibs"
>>>> artifactId="dataprovider" />
>>>
>>>> <artifact groupID="com.sun.woodstock" artifactId="webui-jsf" />
>>>
>>>> <artifact groupID="com.sun.woodstock" artifactId="webui-jsf-
>>>> suntheme" />
>>>
>>>> - <artifact groupID="com.sun.jsftemplating"
>>>> artifactId="jsftemplating-dynafaces" />
>>>
>>>> </excludeArtifactsTransitively>
>>>
>>>> </resolveAll>
>>>
>>>> Index: packager/glassfish-jms/pom.xml
>>>
>>>> ===================================================================
>>>
>>>> --- packager/glassfish-jms/pom.xml (revision 28704)
>>>
>>>> +++ packager/glassfish-jms/pom.xml (working copy)
>>>
>>>> @@ -71,6 +71,11 @@
>>>
>>>> modules to be included in this bundle
>>>
>>>> --> <dependency>
>>>
>>>> + <groupId>org.glassfish.admingui</groupId>
>>>
>>>> + <artifactId>console-jms-plugin</artifactId>
>>>
>>>> + <version>${project.version}</version>
>>>
>>>> + </dependency>
>>>
>>>> + <dependency>
>>>
>>>> <groupId>org.glassfish.jms</groupId>
>>>
>>>> <artifactId>jms-core</artifactId>
>>>
>>>> <version>${project.version}</version>
>>>
>>>>
>>>> Property changes on: jms
>>>
>>>> ___________________________________________________________________
>>>
>>>> Added: svn:ignore
>>>
>>>> + target
>>>
>>>>
>>>>
>>>> Index: admingui/jms-plugin/pom.xml
>>>
>>>> ===================================================================
>>>
>>>> --- admingui/jms-plugin/pom.xml (revision 0)
>>>
>>>> +++ admingui/jms-plugin/pom.xml (revision 0)
>>>
>>>> @@ -0,0 +1,109 @@
>>>
>>>> +<?xml version="1.0" encoding="UTF-8"?>
>>>
>>>> +<!-- +/* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS
>>>> HEADER. +* +* Copyright 1997-2008 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>
>>>
>>>> + <parent>
>>>
>>>> + <groupId>org.glassfish.admingui</groupId>
>>>
>>>> + <artifactId>admingui</artifactId>
>>>
>>>> + <version>3.0-SNAPSHOT</version>
>>>
>>>> + </parent>
>>>
>>>> + <artifactId>console-jms-plugin</artifactId>
>>>
>>>> + <groupId>org.glassfish.admingui</groupId>
>>>
>>>> + <packaging>hk2-jar</packaging>
>>>
>>>> + <name>Admin Console JMS Plugin</name>
>>>
>>>> +
>>>
>>>> + <build>
>>>
>>>> + <plugins>
>>>
>>>> + <plugin>
>>>
>>>> + <groupId>org.apache.felix</groupId>
>>>
>>>> + <artifactId>maven-bundle-plugin</artifactId>
>>>
>>>> + <configuration>
>>>
>>>> + <!-- Enable the plugin for hk2-jar packaging
>>>> type -->
>>>
>>>> + <supportedProjectTypes>
>>>
>>>> + <supportedProjectType>hk2-jar</
>>>> supportedProjectType>
>>>
>>>> + <supportedProjectType>jar</
>>>> supportedProjectType>
>>>
>>>> + <supportedProjectType>bundle</
>>>> supportedProjectType>
>>>
>>>> + </supportedProjectTypes>
>>>
>>>> + <instructions>
>>>
>>>> + <!-- _include does not work. See
>>>> Felix-620.
>>>
>>>> + <_include>osgi.bundle</_include>
>>>
>>>> + -->
>>>
>>>> + <Export-
>>>> Package>org.glassfish.jdbc.admingui</Export-Package>
>>>
>>>> + </instructions>
>>>
>>>> + </configuration>
>>>
>>>> + <executions>
>>>
>>>> + <execution>
>>>
>>>> + <id>bundle-manifest</id>
>>>
>>>> + <phase>process-classes</phase>
>>>
>>>> + <goals>
>>>
>>>> + <goal>manifest</goal>
>>>
>>>> + </goals>
>>>
>>>> + </execution>
>>>
>>>> + </executions>
>>>
>>>> + </plugin>
>>>
>>>> + <plugin>
>>>
>>>> + <groupId>com.sun.enterprise</groupId>
>>>
>>>> + <artifactId>hk2-maven-plugin</artifactId>
>>>
>>>> + <version>${hk2.plugin.version}</version>
>>>
>>>> + <configuration>
>>>
>>>> + <archive>
>>>
>>>> + <!-- Use the manifest.mf produced by
>>>> maven-bundle-plugin:manifest -->
>>>
>>>> + <manifestFile>$
>>>> {project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
>>>
>>>> + </archive>
>>>
>>>> + </configuration>
>>>
>>>> + </plugin>
>>>
>>>> + </plugins>
>>>
>>>> + <resources>
>>>
>>>> + <resource>
>>>
>>>> + <directory>src/main/resources</directory>
>>>
>>>> + <excludes>
>>>
>>>> + <exclude>**/*.jar</exclude>
>>>
>>>> + </excludes>
>>>
>>>> + </resource>
>>>
>>>> + </resources>
>>>
>>>> + </build>
>>>
>>>> +
>>>
>>>> + <dependencies>
>>>
>>>> + <dependency>
>>>
>>>> + <groupId>org.glassfish.admingui</groupId>
>>>
>>>> + <artifactId>console-plugin-service</artifactId>
>>>
>>>> + <version>${project.version}</version>
>>>
>>>> + </dependency>
>>>
>>>> + </dependencies>
>>>
>>>> +</project>
>>>
>>>> Index: admingui/war/pom.xml
>>>
>>>> ===================================================================
>>>
>>>> --- admingui/war/pom.xml (revision 28704)
>>>
>>>> +++ admingui/war/pom.xml (working copy)
>>>
>>>> @@ -96,6 +96,37 @@
>>>
>>>> <version>1.1.1</version>
>>>
>>>> <scope>runtime</scope>
>>>
>>>> </dependency>
>>>
>>>> + <dependency>
>>>
>>>> + <groupId>com.sun.faces.extensions</groupId>
>>>
>>>> + <artifactId>jsf-extensions-dynamic-faces</artifactId>
>>>
>>>> + <version>${jsf-ext.version}</version>
>>>
>>>> + <classifier>jsftemplating</classifier>
>>>
>>>> + <exclusions>
>>>
>>>> + <exclusion>
>>>
>>>> + <groupId>commons-logging</groupId>
>>>
>>>> + <artifactId>commons-logging</artifactId>
>>>
>>>> + </exclusion>
>>>
>>>> + <exclusion>
>>>
>>>> + <groupId>javax.faces</groupId>
>>>
>>>> + <artifactId>shale-remoting</artifactId>
>>>
>>>> + </exclusion>
>>>
>>>> + </exclusions>
>>>
>>>> + </dependency>
>>>
>>>> + <dependency>
>>>
>>>> + <groupId>com.sun.faces.extensions</groupId>
>>>
>>>> + <artifactId>jsf-extensions-common</artifactId>
>>>
>>>> + <version>${jsf-ext.version}</version>
>>>
>>>> + <exclusions>
>>>
>>>> + <exclusion>
>>>
>>>> + <groupId>commons-logging</groupId>
>>>
>>>> + <artifactId>commons-logging</artifactId>
>>>
>>>> + </exclusion>
>>>
>>>> + <exclusion>
>>>
>>>> + <groupId>javax.faces</groupId>
>>>
>>>> + <artifactId>shale-remoting</artifactId>
>>>
>>>> + </exclusion>
>>>
>>>> + </exclusions>
>>>
>>>> + </dependency>
>>>
>>>> </dependencies>
>>>
>>>> <profiles>
>>>
>>>> Index: admingui/pom.xml
>>>
>>>> ===================================================================
>>>
>>>> --- admingui/pom.xml (revision 28704)
>>>
>>>> +++ admingui/pom.xml (working copy)
>>>
>>>> @@ -81,11 +81,12 @@
>>>
>>>> <modules>
>>>
>>>> <module>dataprovider</module>
>>>
>>>> <module>plugin-service</module>
>>>
>>>> - <module>common</module>
>>>
>>>> + <module>common</module>
>>>
>>>> <module>core</module>
>>>
>>>> <module>community-theme</module>
>>>
>>>> <module>web</module>
>>>
>>>> <module>jdbc-gui</module>
>>>
>>>> + <module>jms-plugin</module>
>>>
>>>> <module>ejb</module>
>>>
>>>> <module>ejb-lite</module>
>>>
>>>> <module>corba</module>
>>>
>>>> @@ -133,11 +134,6 @@
>>>
>>>> <scope>provided</scope>
>>>
>>>> </dependency>
>>>
>>>> <dependency>
>>>
>>>> - <groupId>com.sun.jsftemplating</groupId>
>>>
>>>> - <artifactId>jsftemplating-dynafaces</artifactId>
>>>
>>>> - <version>0.1</version>
>>>
>>>> - </dependency>
>>>
>>>> - <dependency>
>>>
>>>> <groupId>com.sun.faces</groupId>
>>>
>>>> <artifactId>jsf-api</artifactId>
>>>
>>>> <version>${jsf-api.version}</version>
>>>
>>>>
>>>> <http://www.java.com> * Jason Lee *
>>>
>>>> Senior Java Developer
>>>
>>>> GlassFish Administration Console
>>>
>>>>
>>>> *Sun Microsystems, Inc.*
>>>
>>>> Phone x31197/+1 405-343-1964
>>>
>>>> Email jasondlee_at_sun.com <mailto:jasondlee_at_sun.com>
>>>
>>>> Blog http://blogs.sun.com/jasondlee
>>>
>>>> Blog http://blogs.steeplesoft.com
>>>
>>>>
>>>>
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net <mailto:dev-unsubscribe_at_glassfish.dev.java.net
>>> >
>>> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net <mailto:dev-help_at_glassfish.dev.java.net
>>> >
>>>
>>
>> <http://www.java.com> * Jason Lee *
>> Senior Java Developer
>> GlassFish Administration Console
>>
>> *Sun Microsystems, Inc.*
>> Phone x31197/+1 405-343-1964
>> Email jasondlee_at_sun.com <mailto:jasondlee_at_sun.com>
>> Blog http://blogs.sun.com/jasondlee
>> Blog http://blogs.steeplesoft.com
>>
>>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe_at_glassfish.dev.java.net
> For additional commands, e-mail: dev-help_at_glassfish.dev.java.net
>
Jason Lee
Senior Java Developer
GlassFish Administration Console
Sun Microsystems, Inc.
Phone x31197/+1 405-343-1964
Email jasondlee_at_sun.com
Blog
http://blogs.sun.com/jasondlee
Blog
http://blogs.steeplesoft.com