[jboss-cvs] JBossAS SVN: r103640 - in projects/embedded/trunk: build and 3 other directories.

Wed Apr 7 12:37:00 EDT 2010

Author: ALRubinger
Date: 2010-04-07 12:36:59 -0400 (Wed, 07 Apr 2010)
New Revision: 103640

Added:
   projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/NoXbRepeatableParticleHandlersLifecycleEventHandler.java
Modified:
   projects/embedded/trunk/api/src/main/java/org/jboss/embedded/api/Deployable.java
   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
Log:
[EMB-85] Remove the hack reverting XB versions and put a proper solution in place for booting using repeatableParticleHandlers=false

Modified: projects/embedded/trunk/api/src/main/java/org/jboss/embedded/api/Deployable.java
===================================================================

--- projects/embedded/trunk/api/src/main/java/org/jboss/embedded/api/Deployable.java	2010-04-07 16:34:50 UTC (rev 103639)
+++ projects/embedded/trunk/api/src/main/java/org/jboss/embedded/api/Deployable.java	2010-04-07 16:36:59 UTC (rev 103640)
@@ -23,9 +23,7 @@
 /**
  * Represents an entity capable of being deployed into the 
  * {@link JBossASEmbeddedServer}.  Anything able to represent itself
- * as a {@link URL} is supported.  Some implementations may, for instance,
- * to serialize object state into a backing temporary file and point
- * to that as the target.
+ * as a {@link URL} is supported.
  *
  * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
  * @version $Revision: $

Modified: projects/embedded/trunk/build/pom.xml
===================================================================
--- projects/embedded/trunk/build/pom.xml	2010-04-07 16:34:50 UTC (rev 103639)
+++ projects/embedded/trunk/build/pom.xml	2010-04-07 16:36:59 UTC (rev 103640)
@@ -156,22 +156,6 @@
         <version>${version.org.jboss.shrinkwrap}</version>
       </dependency>
       
-      <!-- HACK to work around boot errors -->
-      <dependency>
-        <groupId>org.jboss</groupId>
-        <artifactId>jbossxb</artifactId>
-        <version>2.0.2.Beta4</version>
-        <exclusions>
-          <exclusion>
-            <groupId>apache-xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>wutka-dtdparser</groupId>
-            <artifactId>dtdparser121</artifactId>
-          </exclusion>
-        </exclusions>
-      </dependency>
       <!--
 
         AS Module Dependencies (should eventually come in through a

Modified: projects/embedded/trunk/core/pom.xml
===================================================================
--- projects/embedded/trunk/core/pom.xml	2010-04-07 16:34:50 UTC (rev 103639)
+++ projects/embedded/trunk/core/pom.xml	2010-04-07 16:36:59 UTC (rev 103640)
@@ -1,4 +1,4 @@
- <?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
   <!--
   vi:ts=2:sw=2:expandtab:
 -->
@@ -68,8 +68,11 @@
     <dependency>
       <groupId>org.jboss.logmanager</groupId>
       <artifactId>jboss-logmanager</artifactId>
-      <version>1.1.1.GA</version>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+    </dependency>
 
     <!-- 
     Test Dependencies (anything in AS is OK here)

Added: projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/NoXbRepeatableParticleHandlersLifecycleEventHandler.java
===================================================================
--- projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/NoXbRepeatableParticleHandlersLifecycleEventHandler.java	                        (rev 0)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/lifecycle/NoXbRepeatableParticleHandlersLifecycleEventHandler.java	2010-04-07 16:36:59 UTC (rev 103640)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2009, 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;
+
+/**
+ * Lifecycle event handler which, unless otherwise specified,
+ * sets the system property denoting that JBossXB should
+ * not allow repeatable particle handlers
+ *
+ * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
+ * @version $Revision: $
+ * @deprecated Should be removed when this is no longer required by AS
+ * for proper boot.  
+ * @see http://community.jboss.org/message/535319
+ */
+ at Deprecated
+public class NoXbRepeatableParticleHandlersLifecycleEventHandler extends SetSysPropIfNotSpecifiedLifecycleEventHandler
+{
+
+   //-------------------------------------------------------------------------------------||
+   // Class Members ----------------------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /**
+    * System property telling XB whether to allow repeatable particle handlers
+    */
+   private static final String SYS_PROP_XB_REPEATABLE_PARTICLE_HANDLERS = "xb.builder.repeatableParticleHandlers";
+
+   /**
+    * Value for the ignore property
+    */
+   private static final String XB_IGNORE_VALUE = Boolean.FALSE.toString();
+
+   //-------------------------------------------------------------------------------------||
+   // Required Implementations -----------------------------------------------------------||
+   //-------------------------------------------------------------------------------------||
+
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.embedded.core.lifecycle.SetSysPropIfNotSpecifiedLifecycleEventHandler#getSysPropName()
+    */
+   @Override
+   String getSysPropName()
+   {
+      return SYS_PROP_XB_REPEATABLE_PARTICLE_HANDLERS;
+   }
+
+   /**
+    * {@inheritDoc}
+    * @see org.jboss.embedded.core.lifecycle.SetSysPropIfNotSpecifiedLifecycleEventHandler#getSysPropValue()
+    */
+   @Override
+   String getSysPropValue()
+   {
+      return XB_IGNORE_VALUE;
+   }
+
+}

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-04-07 16:34:50 UTC (rev 103639)
+++ projects/embedded/trunk/core/src/main/java/org/jboss/embedded/core/server/JBossASEmbeddedServerImpl.java	2010-04-07 16:36:59 UTC (rev 103640)
@@ -22,7 +22,6 @@
 package org.jboss.embedded.core.server;
 
 import java.io.File;
-import java.io.IOException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
@@ -54,6 +53,7 @@
 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.NoXbRepeatableParticleHandlersLifecycleEventHandler;
 import org.jboss.embedded.core.lifecycle.SetIPv4LifecycleEventHandler;
 import org.jboss.embedded.core.lifecycle.SetRmiHostnameLifecycleEventHandler;
 import org.jboss.kernel.Kernel;
@@ -434,6 +434,9 @@
       @SuppressWarnings("deprecation")
       final LifecycleEventHandler ipv4Handler = new SetIPv4LifecycleEventHandler();
       this.registerEventHandler(LifecycleState.INITIALIZED, ipv4Handler);
+      @SuppressWarnings("deprecation")
+      final LifecycleEventHandler repeatableParticleHandlers = new NoXbRepeatableParticleHandlersLifecycleEventHandler();
+      this.registerEventHandler(LifecycleState.INITIALIZED, repeatableParticleHandlers);
       // Init Logging levels
       //TODO Remove when we can JBLOGGING-37
       this.registerEventHandler(InitLogManagerLevelsLifecycleEventHandler.INSTANCE, LifecycleState.INITIALIZED);


