[jboss-cvs] JBossAS SVN: r109722 - in projects/profileservice/trunk: core/src/main/java/org/jboss/profileservice/management and 2 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Dec 6 08:18:03 EST 2010


Author: emuckenhuber
Date: 2010-12-06 08:18:02 -0500 (Mon, 06 Dec 2010)
New Revision: 109722

Modified:
   projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/ModificationSession.java
   projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/actions/AbstractTwoPhaseModificationAction.java
   projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileMetaData.java
   projects/profileservice/trunk/pom.xml
Log:
propagate failed status, update thirdparty libs

Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/ModificationSession.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/ModificationSession.java	2010-12-06 12:37:16 UTC (rev 109721)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/ModificationSession.java	2010-12-06 13:18:02 UTC (rev 109722)
@@ -121,6 +121,7 @@
       public void setFailure(Throwable t)
       {
          this.failure = t;
+         markAsFailed();
       }
 
       public void fireModificationEvent(ModificationEvent event)

Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/actions/AbstractTwoPhaseModificationAction.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/actions/AbstractTwoPhaseModificationAction.java	2010-12-06 12:37:16 UTC (rev 109721)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/management/actions/AbstractTwoPhaseModificationAction.java	2010-12-06 13:18:02 UTC (rev 109722)
@@ -77,6 +77,7 @@
          catch(Exception e)
          {
             this.state = ActionState.ROLLBACK;
+            response.setFailure(e);
          }
          finally
          {

Modified: projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileMetaData.java
===================================================================
--- projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileMetaData.java	2010-12-06 12:37:16 UTC (rev 109721)
+++ projects/profileservice/trunk/core/src/main/java/org/jboss/profileservice/profile/metadata/BasicProfileMetaData.java	2010-12-06 13:18:02 UTC (rev 109722)
@@ -58,8 +58,6 @@
    /** Requirement on our namespace. */
    private static FeatureRequirement REQUIREMENT = new FeatureRequirement(CommonProfileNameSpaces.PROFILE_NAMESPACE);
 
-   private static final boolean disableComplete = Boolean.getBoolean(Hack.DISABLE_COMPLETE_CHECK);
-   
    /** The aliases. */
    private List<String> aliases;
    
@@ -79,10 +77,11 @@
       return this.deployments;
    }
    
-   // FIXME 
    public boolean isCheckComplete()
    {
-      return disableComplete == false;
+      // FIXME AS has way to many weird dependencies,
+      // so don't check on startup
+      return false;
    }
    
    @Override

Modified: projects/profileservice/trunk/pom.xml
===================================================================
--- projects/profileservice/trunk/pom.xml	2010-12-06 12:37:16 UTC (rev 109721)
+++ projects/profileservice/trunk/pom.xml	2010-12-06 13:18:02 UTC (rev 109722)
@@ -42,14 +42,14 @@
 
 		<version.junit>3.8.2</version.junit>
 		<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
-		<version.org.jboss.classloading>2.2.0.Alpha4</version.org.jboss.classloading>
-		<version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
-		<version.org.jboss.jbossxb>2.0.2.Beta7</version.org.jboss.jbossxb>
+		<version.org.jboss.classloading>2.2.0.Alpha9</version.org.jboss.classloading>
+		<version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
+		<version.org.jboss.jbossxb>2.0.2.Beta9</version.org.jboss.jbossxb>
 		<version.org.jboss.logging>2.2.0.CR1</version.org.jboss.logging>
-		<version.org.jboss.kernel>2.2.0.Alpha9</version.org.jboss.kernel>
+		<version.org.jboss.kernel>2.2.0.Alpha10</version.org.jboss.kernel>
 		<version.org.jboss.man>2.1.1.SP2</version.org.jboss.man>
-		<version.org.jboss.mdr>2.2.0.Alpha2</version.org.jboss.mdr>
-		<version.org.jboss.reflect>2.2.0.Alpha4</version.org.jboss.reflect>
+		<version.org.jboss.mdr>2.2.0.Alpha3</version.org.jboss.mdr>
+		<version.org.jboss.reflect>2.2.0.Alpha9</version.org.jboss.reflect>
 		<version.jboss.test>1.1.0.GA</version.jboss.test>
 		<version.org.jboss.vfs>3.0.0.CR5</version.org.jboss.vfs>
 		<version.sun.jaxb>2.1.9-brew</version.sun.jaxb>



More information about the jboss-cvs-commits mailing list