geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r882065 - in /geronimo/server/trunk: ./ framework/ framework/modules/geronimo-pax-logging/ framework/modules/testsupport-common/ plugins/activemq/geronimo-activemq/ plugins/jasper/ plugins/jasper/geronimo-jasper-builder/src/main/java/org/ap...
Date Thu, 19 Nov 2009 07:54:45 GMT
Author: djencks
Date: Thu Nov 19 07:54:31 2009
New Revision: 882065

URL: http://svn.apache.org/viewvc?rev=882065&view=rev
Log:
use pax-logging 1.4.1-SNAPSHOT, clean up a few other build bits.  All the activated plugins
build for me now, with the smx jdt import patch

Modified:
    geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
    geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
    geronimo/server/trunk/framework/pom.xml
    geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
    geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
    geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java
    geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
    geronimo/server/trunk/plugins/jasper/pom.xml
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
    geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
    geronimo/server/trunk/plugins/webservices/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/geronimo-pax-logging/pom.xml Thu Nov 19 07:54:31
2009
@@ -69,7 +69,31 @@
                     <instructions>
                         <Embed-Dependency>pax-logging-service;inline=true</Embed-Dependency>
  
-                        <Import-Package>com.sun.jdmk.comm;resolution:=optional,javax.jms;resolution:=optional,javax.mail;resolution:=optional,javax.mail.internet;resolution:=optional,javax.management;resolution:=optional,javax.naming;resolution:=optional,javax.swing;resolution:=optional,javax.swing.border;resolution:=optional,javax.swing.event;resolution:=optional,javax.swing.table;resolution:=optional,javax.swing.text;resolution:=optional,javax.swing.tree;resolution:=optional,javax.xml.parsers,org.knopflerfish.service.log;provider=paxlogging;version="[1.1.0,2.0.0)",org.ops4j.pax.logging;version="[0.9.5,2.0.0)",org.ops4j.pax.logging.spi;provider=paxlogging;version="1.4",org.osgi.framework;version="[1.0.0,2.0.0)",org.osgi.service.cm;version="[1.0.0,2.0.0)",org.osgi.service.log;version="[1.3.0,2.0.0)",org.osgi.util.tracker;version="[1.3.0,2.0.0)",org.w3c.dom,org.xml.sax,org.xml.sax.helpers,*</Import-Package>
+                        <Import-Package>com.sun.jdmk.comm;resolution:=optional,
+                            javax.jms;resolution:=optional,
+                            javax.mail;resolution:=optional,
+                            javax.mail.internet;resolution:=optional,
+                            javax.management;resolution:=optional,
+                            javax.naming;resolution:=optional,
+                            javax.swing;resolution:=optional,
+                            javax.swing.border;resolution:=optional,
+                            javax.swing.event;resolution:=optional,
+                            javax.swing.table;resolution:=optional,
+                            javax.swing.text;resolution:=optional,
+                            javax.swing.tree;resolution:=optional,
+                            javax.xml.parsers,
+                            org.knopflerfish.service.log;provider=paxlogging;version="[1.1.0,2.0.0)",
+                            org.ops4j.pax.logging;version="[0.9.5,2.0.0)",
+                            org.ops4j.pax.logging.spi;provider=paxlogging;version="1.4",
+                            org.osgi.framework;version="[1.0.0,2.0.0)",
+                            org.osgi.service.cm;version="[1.0.0,2.0.0)",
+                            org.osgi.service.event;resolution:=optional,
+                            org.osgi.service.log;version="[1.3.0,2.0.0)",
+                            org.osgi.util.tracker;version="[1.3.0,2.0.0)",
+                            org.w3c.dom,
+                            org.xml.sax,
+                            org.xml.sax.helpers,
+                            *</Import-Package>
                         <Export-Package>org.apache.geronimo.logging,org.ops4j.pax.logging.spi;provider=paxlogging;version="1.4"</Export-Package>
                         <!--
                         <Bundle-Activator>org.ops4j.pax.logging.internal.Activator</Bundle-Activator>

Modified: geronimo/server/trunk/framework/modules/testsupport-common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/testsupport-common/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/testsupport-common/pom.xml (original)
+++ geronimo/server/trunk/framework/modules/testsupport-common/pom.xml Thu Nov 19 07:54:31
2009
@@ -35,11 +35,6 @@
     
     <dependencies>
         <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>compile</scope>
@@ -60,25 +55,18 @@
             <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-container-default</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit-extender-impl</artifactId>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.ops4j.pax.runner</groupId>
-            <artifactId>pax-runner-no-jcl</artifactId>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
         </dependency>
+
     </dependencies>
 
 </project>
\ No newline at end of file

Modified: geronimo/server/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/framework/pom.xml (original)
+++ geronimo/server/trunk/framework/pom.xml Thu Nov 19 07:54:31 2009
@@ -196,7 +196,7 @@
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.commons-jexl</artifactId>
-                <version>1.1_2-SNAPSHOT</version>
+                <version>1.1_1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -235,7 +235,7 @@
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.jline</artifactId>
-                <version>0.9.94_2-SNAPSHOT</version>
+                <version>0.9.94_1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
@@ -245,17 +245,17 @@
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
-                <version>1.2_2-SNAPSHOT</version>
+                <version>1.2_1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
-                <version>1.1.4c_2-SNAPSHOT</version>
+                <version>1.1.4c_1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.servicemix.bundles</groupId>
                 <artifactId>org.apache.servicemix.bundles.xstream</artifactId>
-                <version>1.3_2-SNAPSHOT</version>
+                <version>1.3_1</version>
                 <exclusions>
                     <exclusion>
                         <groupId>xpp3</groupId>

Modified: geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/geronimo-activemq/pom.xml Thu Nov 19 07:54:31 2009
@@ -66,7 +66,6 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-            <version>1.4</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/main/java/org/apache/geronimo/jasper/deployment/JspModuleBuilderExtension.java
Thu Nov 19 07:54:31 2009
@@ -47,6 +47,9 @@
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.gbean.annotation.GBean;
+import org.apache.geronimo.gbean.annotation.ParamAttribute;
+import org.apache.geronimo.gbean.annotation.ParamReference;
 import org.apache.geronimo.j2ee.annotation.Holder;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
@@ -85,6 +88,7 @@
  *
  * @version $Rev $Date
  */
+@GBean(j2eeType = NameFactory.MODULE_BUILDER)
 public class JspModuleBuilderExtension implements ModuleBuilderExtension {
 
     private static final Logger log = LoggerFactory.getLogger(JspModuleBuilderExtension.class);
@@ -101,7 +105,8 @@
     private static final String SCHEMA_LOCATION_URL = "http://java.sun.com/xml/ns/javaee/web-jsptaglibrary_2_1.xsd";
     private static final String VERSION = "2.1";
 
-    public JspModuleBuilderExtension(Environment defaultEnvironment, NamingBuilder namingBuilders)
{
+    public JspModuleBuilderExtension(@ParamAttribute(name="defaultEnvironment")Environment
defaultEnvironment,
+                                     @ParamReference(name="NamingBuilders", namingType =
NameFactory.MODULE_BUILDER)NamingBuilder namingBuilders) {
         this.defaultEnvironment = defaultEnvironment;
         this.namingBuilders = namingBuilders;
     }
@@ -710,20 +715,4 @@
         return new URI(path);
     }
 
-    public static final GBeanInfo GBEAN_INFO;
-
-    static {
-        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(JspModuleBuilderExtension.class,
NameFactory.MODULE_BUILDER);
-        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
-        infoBuilder.addReference("NamingBuilders", NamingBuilder.class, NameFactory.MODULE_BUILDER);
-
-        infoBuilder.setConstructor(new String[]{
-                "defaultEnvironment",
-                "NamingBuilders"});
-        GBEAN_INFO = infoBuilder.getBeanInfo();
-    }
-
-    public static GBeanInfo getGBeanInfo() {
-        return GBEAN_INFO;
-    }
 }

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java
(original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper-builder/src/test/java/org/apache/geronimo/jasper/deployment/BasicTest.java
Thu Nov 19 07:54:31 2009
@@ -32,7 +32,6 @@
 public class BasicTest extends TestCase {
     
     public void testMyFacesModuleBuilderExtension() throws Exception {
-        GBeanInfo gBeanInfo = JspModuleBuilderExtension.getGBeanInfo();
         JspModuleBuilderExtension instance = new JspModuleBuilderExtension(null, new NamingBuilderCollection(Collections.EMPTY_SET));
     }
 

Modified: geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/geronimo-jasper/pom.xml Thu Nov 19 07:54:31 2009
@@ -37,12 +37,6 @@
         <dependency>
             <groupId>${tomcatGroupId}</groupId>
             <artifactId>jasper</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-servlet_3.0_spec</artifactId>
-	         </exclusion>
-            </exclusions>
         </dependency>
 
         <!--<dependency>-->
@@ -53,18 +47,11 @@
         <dependency>
             <groupId>${tomcatGroupId}</groupId>
             <artifactId>jasper-el</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.jdt</groupId>
-                    <artifactId>core</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.jdt-core</artifactId>
-            <version>3.2.3_2-SNAPSHOT</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/jasper/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jasper/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jasper/pom.xml (original)
+++ geronimo/server/trunk/plugins/jasper/pom.xml Thu Nov 19 07:54:31 2009
@@ -79,6 +79,10 @@
                         <artifactId>geronimo-servlet_2.5_spec</artifactId>
                     </exclusion>
                     <exclusion>
+                        <groupId>org.apache.geronimo.specs</groupId>
+                        <artifactId>geronimo-servlet_3.0_spec</artifactId>
+                    </exclusion>
+                    <exclusion>
                         <groupId>org.eclipse.jdt</groupId>
                         <artifactId>core</artifactId>
                     </exclusion>
@@ -89,10 +93,10 @@
                 <artifactId>jasper-el</artifactId>
                 <version>${tomcatVersion}</version>
                 <exclusions>
-                    <!--<exclusion>-->
-                    <!--<groupId>${tomcatGroupId}</groupId>-->
-                    <!--<artifactId>el-api</artifactId>-->
-                    <!--</exclusion>-->
+                    <exclusion>
+                        <groupId>org.eclipse.jdt</groupId>
+                        <artifactId>core</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -103,6 +107,11 @@
             <!--</dependency>-->
 
 
+            <dependency>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.jdt-core</artifactId>
+                <version>3.2.3_3-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/pom.xml Thu Nov 19 07:54:31 2009
@@ -104,7 +104,6 @@
         <dependency>
             <groupId>org.ops4j.pax.logging</groupId>
             <artifactId>pax-logging-api</artifactId>
-            <version>1.4</version>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/geronimo-webservices/pom.xml Thu Nov 19 07:54:31
2009
@@ -89,11 +89,6 @@
             <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.ws.scout</groupId>-->
-            <!--<artifactId>scout</artifactId>-->
-        <!--</dependency>-->
-
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-saaj_1.3_spec</artifactId>
@@ -131,7 +126,6 @@
         <dependency>
             <groupId>org.apache.geronimo.javamail</groupId>
             <artifactId>geronimo-javamail_1.4_mail</artifactId>
-            <version>1.8-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/webservices/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/webservices/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/webservices/pom.xml (original)
+++ geronimo/server/trunk/plugins/webservices/pom.xml Thu Nov 19 07:54:31 2009
@@ -18,28 +18,39 @@
 
 <!-- $Rev$ $Date$ -->
 
-<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">
+<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.apache.geronimo.plugins</groupId>
         <artifactId>plugins</artifactId>
         <version>3.0-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>webservices</artifactId>
     <name>Geronimo Plugins, Web Services</name>
     <packaging>pom</packaging>
-    
+
     <description>
         webservices plugin
     </description>
-    
+
     <modules>
         <module>geronimo-webservices</module>
         <module>geronimo-webservices-builder</module>
         <module>webservices-common</module>
     </modules>
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.framework</groupId>
+                <artifactId>framework</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 </project>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=882065&r1=882064&r2=882065&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Thu Nov 19 07:54:31 2009
@@ -92,7 +92,7 @@
         <servletSpec>geronimo-servlet_3.0_spec</servletSpec>
 
         <monitoringConsoleVersion>${version}</monitoringConsoleVersion>
-        <pax.logging.version>1.4</pax.logging.version>
+        <pax.logging.version>1.4.1-SNAPSHOT</pax.logging.version>
 
         <!-- Deployers -->
         <gbeanDeployerBootstrap>org.apache.geronimo.framework/geronimo-gbean-deployer-bootstrap/${version}/car
@@ -2211,6 +2211,23 @@
         </site>
     </distributionManagement>
 
+    <repositories>
+        <repository>
+            <id>ops4j.snapshots</id>
+            <name>OPS4J Snapshots Repository</name>
+            <layout>default</layout>
+            <url>http://repository.ops4j.org/mvn-snapshots/</url>
+            <snapshots>
+                <enabled>true</enabled>
+                <updatePolicy>always</updatePolicy>
+                <checksumPolicy>warn</checksumPolicy>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
+    
     <pluginRepositories>
         <!-- required for clean build unless you want to bootstrap the car-maven-plugin
-->
         <pluginRepository>



Mime
View raw message