[jboss-cvs] JBossAS SVN: r101456 - in projects/embedded/trunk: core and 8 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Feb 25 04:47:09 EST 2010 

Author: ALRubinger
Date: 2010-02-25 04:47:08 -0500 (Thu, 25 Feb 2010)
New Revision: 101456

Added:
   projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/InitLogManagerLevelsLifecycleEventHandler.java
   projects/embedded/trunk/core/src/test/resources/bootstrap.xml
Modified:
   projects/embedded/trunk/build/pom.xml
   projects/embedded/trunk/core/pom.xml
   projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java
   projects/embedded/trunk/core/src/test/java/org/jboss/embedded/core/deployable/DeployableImplementationsUnitTest.java
   projects/embedded/trunk/core/src/test/java/org/jboss/embedded/core/server/ServerInitializationUnitTest.java
   projects/embedded/trunk/depchain/pom.xml
   projects/embedded/trunk/testsuite/
   projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerIntegrationTest.java
Log:
[EMB-84] Bring EmbeddedAS in line w/ latest AS trunk

Modified: projects/embedded/trunk/build/pom.xml
===================================================================
--- projects/embedded/trunk/build/pom.xml	2010-02-25 09:43:20 UTC (rev 101455)
+++ projects/embedded/trunk/build/pom.xml	2010-02-25 09:47:08 UTC (rev 101456)
@@ -9,7 +9,7 @@
   <parent>
     <groupId>org.jboss.jbossas</groupId>
     <artifactId>jboss-as-component-matrix</artifactId>
-    <version>6.0.0.M1</version> <!-- Must match version.org.jboss.jbossas below -->
+    <version>6.0.0-SNAPSHOT</version> <!-- Must match version.org.jboss.jbossas below -->
   </parent>
 
   <!-- Model Version -->
@@ -28,8 +28,8 @@
 
     <!-- Versioning -->
     <version.junit_junit>4.7</version.junit_junit>
-    <version.org.jboss.jbossas>6.0.0.M1</version.org.jboss.jbossas>
-    <version.org.jboss.shrinkwrap>1.0.0-alpha-3</version.org.jboss.shrinkwrap>
+    <version.org.jboss.jbossas>6.0.0-SNAPSHOT</version.org.jboss.jbossas>
+    <version.org.jboss.shrinkwrap>1.0.0-alpha-6</version.org.jboss.shrinkwrap>
 
   </properties>
 

Modified: projects/embedded/trunk/core/pom.xml
===================================================================
--- projects/embedded/trunk/core/pom.xml	2010-02-25 09:43:20 UTC (rev 101455)
+++ projects/embedded/trunk/core/pom.xml	2010-02-25 09:47:08 UTC (rev 101456)
@@ -59,6 +59,13 @@
       <groupId>org.jboss.shrinkwrap</groupId>
       <artifactId>shrinkwrap-impl-base</artifactId>
     </dependency>
+    
+    <!-- org.jboss.logmanager -->
+    <dependency>
+      <groupId>org.jboss.logmanager</groupId>
+      <artifactId>jboss-logmanager</artifactId>
+      <version>1.1.1.GA</version>
+    </dependency>
 
     <!-- 
     Test Dependencies (anything in AS is OK here)

Added: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/InitLogManagerLevelsLifecycleEventHandler.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/InitLogManagerLevelsLifecycleEventHandler.java	                        (rev 0)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/InitLogManagerLevelsLifecycleEventHandler.java	2010-02-25 09:47:08 UTC (rev 101456)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+  *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.embedded.core.lifecycle;
+
+import org.jboss.bootstrap.api.lifecycle.LifecycleEventException;
+import org.jboss.bootstrap.api.lifecycle.LifecycleEventHandler;
+import org.jboss.bootstrap.api.lifecycle.LifecycleState;
+import org.jboss.logmanager.Level;
+
+/**
+ * Explicitly calls upon the static initializer of 
+ * {@link Level} such that it may be used by the boot sequence without
+ * error.  Workaround for JBLOGGING-37.
+ * 
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ * @deprecated Until DML can address this workaround elsewhere
+ */
+ at Deprecated
+public enum InitLogManagerLevelsLifecycleEventHandler implements LifecycleEventHandler {
+
+   //-------------------------------------------------------------------------------------||
+   // Class Members ----------------------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /**
+    * Singleton
+    */
+   INSTANCE;
+
+   //-------------------------------------------------------------------------------------||
+   // Required Implementations -----------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.bootstrap.api.lifecycle.LifecycleEventHandler#handleEvent(org.jboss.bootstrap.api.lifecycle.LifecycleState)
+    */
+   @Override
+   public void handleEvent(final LifecycleState arg0) throws LifecycleEventException
+   {
+      // Just init the logging system
+      @SuppressWarnings("unused")
+      Object obj = Level.ERROR;
+   }
+}

Modified: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java	2010-02-25 09:43:20 UTC (rev 101455)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java	2010-02-25 09:47:08 UTC (rev 101456)
@@ -51,6 +51,7 @@
 import org.jboss.embedded.core.deployable.DeployableFile;
 import org.jboss.embedded.core.deployable.DeployableUrl;
 import org.jboss.embedded.core.lifecycle.IgnoreXbUnorderedSequenceLifecycleEventHandler;
+import org.jboss.embedded.core.lifecycle.InitLogManagerLevelsLifecycleEventHandler;
 import org.jboss.embedded.core.lifecycle.InitLoggingManagerLifecycleEventHandler;
 import org.jboss.embedded.core.lifecycle.SetIPv4LifecycleEventHandler;
 import org.jboss.embedded.core.lifecycle.SetRmiHostnameLifecycleEventHandler;
@@ -151,7 +152,7 @@
       {
          throw new IllegalArgumentException("JBOSS_HOME must be specified");
       }
-
+      
       // Override JBOSS_HOME by setting the system property
       SecurityActions.setJBossHomeSystemProperty(jbossHome);
    }
@@ -432,6 +433,9 @@
       @SuppressWarnings("deprecation")
       final LifecycleEventHandler ipv4Handler = new SetIPv4LifecycleEventHandler();
       this.registerEventHandler(LifecycleState.INITIALIZED, ipv4Handler);
+      // Init Logging levels
+      //TODO Remove when we can JBLOGGING-37
+      this.registerEventHandler(InitLogManagerLevelsLifecycleEventHandler.INSTANCE, LifecycleState.INITIALIZED);
    }
 
    /**

Modified: projects/embedded/trunk/core/src/test/java/org/jboss/embedded/core/deployable/DeployableImplementationsUnitTest.java
===================================================================
--- projects/embedded/trunk/core/src/test/java/org/jboss/embedded/core/deployable/DeployableImplementationsUnitTest.java	2010-02-25 09:43:20 UTC (rev 101455)
+++ projects/embedded/trunk/core/src/test/java/org/jboss/embedded/core/deployable/DeployableImplementationsUnitTest.java	2010-02-25 09:47:08 UTC (rev 101456)
@@ -66,7 +66,7 @@
    public void testDeployableArchive() throws Exception
    {
       // Create an archive
-      final JavaArchive archive = Archives.create("archive.jar", JavaArchive.class);
+      final JavaArchive archive = Archives.create("archive.jar", JavaArchive.class).addClass(this.getClass());
 
       // Make a Deployable
       final Deployable deployable = new DeployableArchive(archive);
@@ -80,7 +80,7 @@
       this.assertEqualStreamContents(expectedStream, roundtripStream);
 
       // Test Equality
-      final JavaArchive unequalArchive = Archives.create("unequal.jar", JavaArchive.class);
+      final JavaArchive unequalArchive = Archives.create("unequal.jar", JavaArchive.class).addClass(this.getClass());
       final Deployable unequalDeployable = new DeployableArchive(unequalArchive);
       final Deployable equalDeployable = new DeployableArchive(archive);
       this.assertEquality(deployable, equalDeployable, unequalDeployable);

Modified: projects/embedded/trunk/core/src/test/java/org/jboss/embedded/core/server/ServerInitializationUnitTest.java
===================================================================
--- projects/embedded/trunk/core/src/test/java/org/jboss/embedded/core/server/ServerInitializationUnitTest.java	2010-02-25 09:43:20 UTC (rev 101455)
+++ projects/embedded/trunk/core/src/test/java/org/jboss/embedded/core/server/ServerInitializationUnitTest.java	2010-02-25 09:47:08 UTC (rev 101456)
@@ -66,6 +66,9 @@
       server = JBossASEmbeddedServerFactory.createServer();
       // Don't do any validation of JBOSS_HOME or related environment
       ((ServerProvider<?, ?>) server).setValidator(null);
+      // Set a dummy bootstrap so we don't err out in parsing
+      server.getConfiguration().bootstrapHome(
+            ServerInitializationUnitTest.class.getProtectionDomain().getCodeSource().getLocation());
       // Init
       server.initialize();
    }

Added: projects/embedded/trunk/core/src/test/resources/bootstrap.xml
===================================================================
--- projects/embedded/trunk/core/src/test/resources/bootstrap.xml	                        (rev 0)
+++ projects/embedded/trunk/core/src/test/resources/bootstrap.xml	2010-02-25 09:47:08 UTC (rev 101456)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bootstrap xmlns="urn:jboss:bootstrap:1.0">
+
+
+  <!--
+    Dummy file for testing, would ordinarily contain:
+
+    <url>something.xml</url>
+  -->
+
+</bootstrap>
\ No newline at end of file

Modified: projects/embedded/trunk/depchain/pom.xml
===================================================================
--- projects/embedded/trunk/depchain/pom.xml	2010-02-25 09:43:20 UTC (rev 101455)
+++ projects/embedded/trunk/depchain/pom.xml	2010-02-25 09:47:08 UTC (rev 101456)
@@ -34,11 +34,13 @@
       chain
     -->
 
-    <version.jboss.web>2.1.3.GA</version.jboss.web>
-    <version.jboss.messaging>1.4.3.GA</version.jboss.messaging>
+    <version.jboss.web>3.0.0-beta-2</version.jboss.web>
+    <version.jboss.messaging>1.4.6.GA</version.jboss.messaging>
     <version.org.slf4j_slf4j.jboss.logging>1.0.2.GA</version.org.slf4j_slf4j.jboss.logging>
     <version.org.jboss.cache_jbosscache.pojo>3.0.0.GA</version.org.jboss.cache_jbosscache.pojo>
     <version.xerces_xercesImpl>2.9.1</version.xerces_xercesImpl>
+    <version.org.codehaus.woodstox>3.2.6</version.org.codehaus.woodstox>
+    <version.com.sun.xml.bind>2.2</version.com.sun.xml.bind>
 
   </properties>
 
@@ -85,6 +87,12 @@
       <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-connector</artifactId>
       <version>${version.org.jboss.jbossas}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>sun-jaxb</groupId>
+          <artifactId>jaxb-impl</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
@@ -98,16 +106,6 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-j2se</artifactId>
-      <version>${version.org.jboss.jbossas}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-jmx</artifactId>
-      <version>${version.org.jboss.jbossas}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-main</artifactId>
       <version>${version.org.jboss.jbossas}</version>
     </dependency>
@@ -118,11 +116,6 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.jbossas</groupId>
-      <artifactId>jboss-as-mbeans</artifactId>
-      <version>${version.org.jboss.jbossas}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.jbossas</groupId>
       <artifactId>jboss-as-profileservice</artifactId>
       <version>${version.org.jboss.jbossas}</version>
     </dependency>
@@ -212,14 +205,14 @@
       <version>${version.org.jboss.jbossas}</version>
     </dependency>
     <dependency>
-      <groupId>sun-jaxb</groupId>
+      <groupId>com.sun.xml.bind</groupId>
       <artifactId>jaxb-impl</artifactId>
-      <version>${version.sun.jaxb}</version>
+      <version>${version.com.sun.xml.bind}</version>
     </dependency>
     <dependency>
       <groupId>org.codehaus.woodstox</groupId>
       <artifactId>wstx-lgpl</artifactId>
-      <version>3.2.6</version>
+      <version>${version.org.codehaus.woodstox}</version>
     </dependency>
     <dependency>
       <groupId>org.jboss.ws.native</groupId>


Property changes on: projects/embedded/trunk/testsuite
___________________________________________________________________
Name: svn:ignore
   - target
eclipse-target
target-eclipse
bin
.settings
.classpath
.project

   + target
eclipse-target
target-eclipse
bin
.settings
.classpath
.project
transaction.log


Modified: projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerIntegrationTest.java
===================================================================
--- projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerIntegrationTest.java	2010-02-25 09:43:20 UTC (rev 101455)
+++ projects/embedded/trunk/testsuite/src/test/java/org/jboss/embedded/testsuite/ServerIntegrationTest.java	2010-02-25 09:47:08 UTC (rev 101456)
@@ -54,6 +54,7 @@
 import org.apache.http.client.utils.URLEncodedUtils;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.message.BasicNameValuePair;
+import org.jboss.bootstrap.api.as.server.JBossASServer;
 import org.jboss.bootstrap.api.lifecycle.LifecycleState;
 import org.jboss.embedded.api.server.JBossASEmbeddedServer;
 import org.jboss.embedded.api.server.JBossASEmbeddedServerFactory;
@@ -66,11 +67,11 @@
 import org.jboss.embedded.testsuite.ejb3.slsb.OutputLocalBusiness;
 import org.jboss.embedded.testsuite.mc.StateReportingBean;
 import org.jboss.embedded.testsuite.servlet.JspForwardingServlet;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.Archives;
-import org.jboss.shrinkwrap.api.Path;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.path.BasicPath;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -102,6 +103,7 @@
     * The server instance
     */
    private static JBossASEmbeddedServer server;
+   JBossASServer server2;
 
    /**
     * Path, relative to the resources base, of the directory containing web.xml descriptor for tests
@@ -208,7 +210,7 @@
     */
    @BeforeClass
    public static void startEmbedddedASAndSetNamingContext() throws Exception
-   {
+   {      
       // Make Server (will pull JBOSS_HOME from env var or sys prop)
       server = JBossASEmbeddedServerFactory.createServer();
       log.info("Created: " + server);
@@ -293,7 +295,7 @@
       final String name = appName + ".war";
       final Class<?> servletClass = JspForwardingServlet.class;
       final WebArchive archive = Archives.create(name, WebArchive.class);
-      final Path targetPathWebXml = new BasicPath("web.xml");
+      final ArchivePath targetPathWebXml = ArchivePaths.create("web.xml");
       archive.addWebResource(PATH_ACTUAL_WEB_XML, targetPathWebXml).addResource(PATH_JSP).addClass(servletClass);
       log.info(archive.toString(true));
 
@@ -348,7 +350,7 @@
       // Create a virtual archive for the MDB deployment
       final String name = "jms-mdb-test.jar";
       final JavaArchive archive = Archives.create(name, JavaArchive.class);
-      final Path queuesTargetPath = new BasicPath(FILENAME_QUEUE_SERVICE_XML);
+      final ArchivePath queuesTargetPath = ArchivePaths.create(FILENAME_QUEUE_SERVICE_XML);
       archive.addClass(MessageStoringMdb.class).addResource(PATH_QUEUE_SERVICE_XML, queuesTargetPath);
 
       // Deploy
@@ -405,8 +407,8 @@
 
       // Create a virtual archive for DS, persistence.xml, Entity, and SLSB
       final String name = "datasource-entity-test.jar";
-      final Path targetDsPath = new BasicPath(FILENAME_EMBEDDED_DS); //TODO Use factory when available
-      final Path targetPersistencePath = new BasicPath(PATH_DESTINATION_PERSISTENCE_XML); //TODO Use factory when available
+      final ArchivePath targetDsPath = ArchivePaths.create(FILENAME_EMBEDDED_DS);
+      final ArchivePath targetPersistencePath = ArchivePaths.create(PATH_DESTINATION_PERSISTENCE_XML);
       final JavaArchive archive = Archives.create(name, JavaArchive.class);
       archive.addClasses(Jbossian.class, JbossianRegistrarLocalBusiness.class, JbossianRegistrarBean.class)
             .addResource(PATH_RESOURCE_DS_XML_EMBEDDED, targetDsPath).addManifestResource(

More information about the jboss-cvs-commits mailing list