From portal-commits at lists.jboss.org Fri Oct  5 12:04:07 2007
Content-Type: multipart/mixed; boundary="===============2031058216464742215=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r8542 - in trunk:
 core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF and 5 other
 directories.
Date: Fri, 05 Oct 2007 12:04:07 -0400
Message-ID: <E1Idpep-0003NO-4U@committer01.frg.pub.inap.atl.jboss.com>

--===============2031058216464742215==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2007-10-05 12:04:06 -0400 (Fri, 05 Oct 2007)
New Revision: 8542

Added:
   trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfig=
urationProvider.java
   trunk/wsrp/src/resources/portal-wsrp-sar/xsd/
   trunk/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd
Removed:
   trunk/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd
Modified:
   trunk/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.java
   trunk/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.java
   trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-config=
.xml
   trunk/wsrp/build.xml
   trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfig=
urationService.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerC=
onfigurationServiceImpl.java
   trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerR=
egistrationRequirementsImpl.java
Log:
- JBPORTAL-1715: Added support for saving producer configuration (finally f=
igured out that you can't use a FileWriter directly to marshall objects wit=
h XB).
- Added XML Schema version of the producer configuration file format (requi=
red for XB marshalling to work properly, haven't been able to use the DTD f=
or that purpose).
- Added logging to ManagedBean.

Modified: trunk/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBe=
an.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.jav=
a	2007-10-05 15:50:22 UTC (rev 8541)
+++ trunk/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ManagedBean.jav=
a	2007-10-05 16:04:06 UTC (rev 8542)
@@ -23,6 +23,9 @@
 =

 package org.jboss.portal.wsrp.admin.ui;
 =

+import org.jboss.logging.Logger;
+
+
 /**
  * @author <a href=3D"mailto:chris.laprun(a)jboss.com">Chris Laprun</a>
  * @version $Revision: 7509 $
@@ -30,6 +33,8 @@
  */
 public class ManagedBean
 {
+   protected Logger log =3D Logger.getLogger(getClass());
+
    protected BeanContext beanContext;
 =

    public void setBeanContext(BeanContext beanContext)

Modified: trunk/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerB=
ean.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.ja=
va	2007-10-05 15:50:22 UTC (rev 8541)
+++ trunk/core-wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ProducerBean.ja=
va	2007-10-05 16:04:06 UTC (rev 8542)
@@ -26,6 +26,7 @@
 import org.jboss.portal.registration.RegistrationPolicy;
 import org.jboss.portal.registration.policies.DefaultRegistrationPolicy;
 import org.jboss.portal.wsrp.producer.config.ProducerConfiguration;
+import org.jboss.portal.wsrp.producer.config.ProducerConfigurationService;
 import org.jboss.portal.wsrp.producer.config.ProducerRegistrationRequireme=
nts;
 import org.jboss.portal.wsrp.registration.RegistrationPropertyDescription;
 =

@@ -43,20 +44,25 @@
  */
 public class ProducerBean extends ManagedBean
 {
-   private ProducerConfiguration configuration;
+   private ProducerConfigurationService configurationService;
    private String policyClassName;
    private String validatorClassName;
 =

-   public ProducerConfiguration getConfiguration()
+   public ProducerConfigurationService getConfigurationService()
    {
-      return configuration;
+      return configurationService;
    }
 =

-   public void setConfiguration(ProducerConfiguration configuration)
+   public void setConfigurationService(ProducerConfigurationService config=
urationService)
    {
-      this.configuration =3D configuration;
+      this.configurationService =3D configurationService;
    }
 =

+   public ProducerConfiguration getConfiguration()
+   {
+      return configurationService.getConfiguration();
+   }
+
    public boolean isRegistrationRequiredForFullDescription()
    {
       return getRegRequirements().isRegistrationRequiredForFullDescription=
();
@@ -64,7 +70,7 @@
 =

    private ProducerRegistrationRequirements getRegRequirements()
    {
-      return configuration.getRegistrationRequirements();
+      return getConfiguration().getRegistrationRequirements();
    }
 =

    public void setRegistrationRequiredForFullDescription(boolean requireRe=
gForFullDescription)
@@ -139,4 +145,18 @@
    {
       return Collections.singletonList(new SelectItem("xsd:string"));
    }
+
+   public String save()
+   {
+      try
+      {
+         configurationService.saveConfiguration();
+      }
+      catch (Exception e)
+      {
+         log.debug(e);
+         beanContext.createErrorMessage("status", "Couldn't save producer =
configuration. Cause: " + e.getLocalizedMessage());
+      }
+      return null;
+   }
 }

Modified: trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces=
-config.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-confi=
g.xml	2007-10-05 15:50:22 UTC (rev 8541)
+++ trunk/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/faces-confi=
g.xml	2007-10-05 16:04:06 UTC (rev 8542)
@@ -85,9 +85,9 @@
       <managed-bean-class>org.jboss.portal.wsrp.admin.ui.ProducerBean</man=
aged-bean-class>
       <managed-bean-scope>session</managed-bean-scope>
       <managed-property>
-         <property-name>configuration</property-name>
-         <property-class>org.jboss.portal.wsrp.producer.config.ProducerCon=
figuration</property-class>
-         <value>#{applicationScope.ProducerConfigurationService.configurat=
ion}</value>
+         <property-name>configurationService</property-name>
+         <property-class>org.jboss.portal.wsrp.producer.config.ProducerCon=
figurationService</property-class>
+         <value>#{applicationScope.ProducerConfigurationService}</value>
       </managed-property>
       <managed-property>
          <property-name>beanContext</property-name>

Modified: trunk/wsrp/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wsrp/build.xml	2007-10-05 15:50:22 UTC (rev 8541)
+++ trunk/wsrp/build.xml	2007-10-05 16:04:06 UTC (rev 8542)
@@ -133,6 +133,7 @@
          <!-- needed to compile on JDK 1.4 -->
          <pathelement path=3D"${jbossas/core.libs.lib}/namespace.jar"/>
 =

+         <path refid=3D"apache.xerces.classpath"/>
          <path refid=3D"ibm.wsdl4j.classpath"/>
          <path refid=3D"jboss.jbossxb.classpath"/>
          <path refid=3D"apache.httpclient.classpath"/>
@@ -158,12 +159,12 @@
          <pathelement path=3D"${jboss.deploy.lib.dir}/jboss-transaction.ja=
r"/>
          <path refid=3D"jboss.serialization.classpath"/>
          <path refid=3D"jboss.remoting.classpath"/>
-         =

+
          <path refid=3D"apache.logging.classpath"/>
       </path>
 =

       <!-- Configure modules -->
-      <call target=3D"configure-modules"/>      =

+      <call target=3D"configure-modules"/>
 =

       <path id=3D"dependentmodule.classpath">
          <path refid=3D"jboss.portal-common.classpath"/>
@@ -319,13 +320,14 @@
 =

       <!-- Build Admin GUI... -->
       <ant inheritAll=3D"false" antfile=3D"../core-wsrp/build.xml" output=
=3D"output.log" dir=3D"../core-wsrp" target=3D"output">
-   	     <property name=3D"build.lib" value=3D"${build.lib}"/>
-  	     <property name=3D"build.resources" value=3D"${build.resources}"/>
+         <property name=3D"build.lib" value=3D"${build.lib}"/>
+         <property name=3D"build.resources" value=3D"${build.resources}"/>
    	  </ant>
       <copy todir=3D"${build.resources}/portal-wsrp-sar" overwrite=3D"true=
">
          <fileset dir=3D"${build.lib}" includes=3D"portal-wsrp-client.jar"=
/>
          <fileset dir=3D"${build.lib}" includes=3D"portal-wsrp.jse"/>
       </copy>
+
       <copy todir=3D"${build.resources}/portal-wsrp-sar" overwrite=3D"true=
">
          <fileset dir=3D"${build.lib}" includes=3D"portal-wsrp-lib.jar"/>
          <fileset dir=3D"./output/lib" includes=3D"portal-wsrp-admin.war"/>
@@ -860,11 +862,11 @@
          <x-classpath>
             <fileset dir=3D"${build.lib}" includes=3D"portal-wsrp-lib.jar"=
/>
             <fileset dir=3D"${build.lib.test}" includes=3D"test-other-lib.=
jar"/>
-            <path refid=3D"tests.classpath"/>            =

+            <path refid=3D"tests.classpath"/>
 =

             <path refid=3D"jboss.portal-server.classpath"/>
             <path refid=3D"jboss.portal-portlet.classpath"/>
-            <path refid=3D"jboss.portlet-api.classpath"/>                 =
              =

+            <path refid=3D"jboss.portlet-api.classpath"/>
          </x-classpath>
       </execute-tests>
    </target>

Copied: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerC=
onfigurationProvider.java (from rev 8541, branches/JBoss_Portal_Branch_2_6/=
wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationPr=
ovider.java)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfi=
gurationProvider.java	                        (rev 0)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfi=
gurationProvider.java	2007-10-05 16:04:06 UTC (rev 8542)
@@ -0,0 +1,147 @@
+/*************************************************************************=
*****
+ * JBoss, a division of Red Hat                                           =
    *
+ * Copyright 2007, Red Hat Middleware, LLC, and individual                =
    *
+ * contributors as indicated by the @authors tag. See the                 =
    *
+ * copyright.txt 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.portal.wsrp.producer.config;
+
+import org.jboss.portal.registration.RegistrationPolicy;
+import org.jboss.portal.registration.policies.DefaultRegistrationPolicy;
+import org.jboss.portal.wsrp.producer.config.impl.ProducerConfigurationImp=
l;
+import org.jboss.portal.wsrp.producer.config.impl.ProducerRegistrationRequ=
irementsImpl;
+import org.jboss.portal.wsrp.registration.LocalizedString;
+import org.jboss.portal.wsrp.registration.RegistrationPropertyDescription;
+import org.jboss.xb.binding.MarshallingContext;
+import org.jboss.xb.binding.ObjectModelProvider;
+
+/**
+ * @author <a href=3D"mailto:chris.laprun(a)jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ * @since 2.6.3
+ */
+public class ProducerConfigurationProvider implements ObjectModelProvider
+{
+   public Object getRoot(Object o, MarshallingContext marshallingContext, =
String s, String s1)
+   {
+      return o;
+   }
+
+   public Object getChildren(ProducerConfigurationImpl configuration, Stri=
ng namespaceUri, String localName)
+   {
+      if ("registration-configuration".equals(localName))
+      {
+         ProducerRegistrationRequirements registrationRequirements =3D con=
figuration.getRegistrationRequirements();
+         if (registrationRequirements !=3D null && registrationRequirement=
s.isRegistrationRequired())
+         {
+            return registrationRequirements;
+         }
+      }
+      else if ("producer-configuration".equals(localName))
+      {
+         return configuration;
+      }
+
+      return null;
+   }
+
+   public Object getChildren(ProducerRegistrationRequirementsImpl regReq, =
String namespaceUri, String localName)
+   {
+      if ("registration-property-description".equals(localName))
+      {
+         return regReq.getRegistrationProperties().values();
+      }
+
+      return null;
+   }
+
+   public Object getAttributeValue(ProducerConfigurationImpl configuration=
, String namespaceUri, String localName)
+   {
+      if ("fullServiceDescriptionRequiresRegistration".equals(localName))
+      {
+         return configuration.getRegistrationRequirements().isRegistration=
RequiredForFullDescription();
+      }
+
+      return null;
+   }
+
+   public Object getElementValue(ProducerRegistrationRequirementsImpl regR=
eq, String namespaceUri, String localName)
+   {
+      Object value =3D null;
+      if ("registration-policy".equals(localName))
+      {
+         RegistrationPolicy policy =3D regReq.getPolicy();
+         if (policy !=3D null)
+         {
+            value =3D policy.getClass().getName();
+         }
+      }
+      else if ("registration-property-validator".equals(localName))
+      {
+         RegistrationPolicy policy =3D regReq.getPolicy();
+         if (policy instanceof DefaultRegistrationPolicy)
+         {
+            DefaultRegistrationPolicy defaultRegistrationPolicy =3D (Defau=
ltRegistrationPolicy)policy;
+            value =3D defaultRegistrationPolicy.getValidator().getClass().=
getName();
+         }
+      }
+      else
+      {
+         value =3D null;
+      }
+      return value;
+   }
+
+   public Object getElementValue(RegistrationPropertyDescription propertyD=
escription, String namespaceUri, String localName)
+   {
+      Object value =3D null;
+      if ("name".equals(localName))
+      {
+         value =3D propertyDescription.getName();
+      }
+      else if ("type".equals(localName))
+      {
+         value =3D propertyDescription.getType();
+      }
+      else if ("label".equals(localName))
+      {
+         value =3D propertyDescription.getLabel();
+      }
+      else if ("hint".equals(localName))
+      {
+         value =3D propertyDescription.getHint();
+      }
+      return value;
+   }
+
+   public Object getAttributeValue(LocalizedString localizedString, String=
 namespaceUri, String localName)
+   {
+      Object value =3D null;
+      if ("lang".equals(localName))
+      {
+         value =3D localizedString.getLocale().getCountry();
+      }
+      else if ("resourceName".equals(localName))
+      {
+         value =3D localizedString.getResourceName();
+      }
+      return value;
+   }
+}

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/Produce=
rConfigurationService.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfi=
gurationService.java	2007-10-05 15:50:22 UTC (rev 8541)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfi=
gurationService.java	2007-10-05 16:04:06 UTC (rev 8542)
@@ -31,4 +31,20 @@
 public interface ProducerConfigurationService
 {
    public ProducerConfiguration getConfiguration();
+
+   /**
+    * Reloads the producer configuration from persistent storage.
+    *
+    * @throws Exception
+    * @since 2.6.3
+    */
+   void reloadConfiguration() throws Exception;
+
+   /**
+    * Saves the producer configuration to persistent storage.
+    *
+    * @throws Exception
+    * @since 2.6.3
+    */
+   void saveConfiguration() throws Exception;
 }

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/Pr=
oducerConfigurationServiceImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/Producer=
ConfigurationServiceImpl.java	2007-10-05 15:50:22 UTC (rev 8541)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/Producer=
ConfigurationServiceImpl.java	2007-10-05 16:04:06 UTC (rev 8542)
@@ -23,15 +23,32 @@
 =

 package org.jboss.portal.wsrp.producer.config.impl;
 =

+import org.jboss.mx.util.MBeanServerLocator;
+import org.jboss.mx.util.ObjectNameFactory;
 import org.jboss.portal.common.net.URLTools;
 import org.jboss.portal.jems.as.system.AbstractJBossService;
 import org.jboss.portal.wsrp.producer.config.ProducerConfiguration;
 import org.jboss.portal.wsrp.producer.config.ProducerConfigurationFactory;
+import org.jboss.portal.wsrp.producer.config.ProducerConfigurationProvider;
 import org.jboss.portal.wsrp.producer.config.ProducerConfigurationService;
+import org.jboss.xb.binding.JBossXBException;
 import org.jboss.xb.binding.ObjectModelFactory;
+import org.jboss.xb.binding.ObjectModelProvider;
 import org.jboss.xb.binding.Unmarshaller;
 import org.jboss.xb.binding.UnmarshallerFactory;
+import org.jboss.xb.binding.XercesXsMarshaller;
 =

+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringWriter;
+import java.io.Writer;
 import java.net.URL;
 import java.util.Enumeration;
 =

@@ -45,6 +62,10 @@
    private String configLocation;
    private ProducerConfiguration configuration;
 =

+
+   private File dataDir;
+   private File config;
+
    public String getConfigLocation()
    {
       return configLocation;
@@ -63,32 +84,119 @@
 =

    protected void startService() throws Exception
    {
-      // Setup URLs
-      if (configLocation =3D=3D null)
+      MBeanServer server =3D MBeanServerLocator.locateJBoss();
+      ObjectName oname =3D ObjectNameFactory.create("jboss.system:type=3DS=
erverConfig");
+      try
       {
-         throw new Exception("The config location is null");
+         dataDir =3D (File)server.getAttribute(oname, "ServerDataDir");
       }
-
-      // make sure we pick the furthest down the path in case there's seve=
ral similarly named resources in the path
-      Enumeration resources =3D Thread.currentThread().getContextClassLoad=
er().getResources(configLocation);
-      URL configURL =3D null;
-      while (resources.hasMoreElements())
+      catch (Exception e)
       {
-         configURL =3D (URL)resources.nextElement();
+         throw new RuntimeException("Couldn't locate server data dir!", e);
       }
+      config =3D new File(dataDir, "portal/wsrp-producer-config.xml");
 =

-      if (configURL =3D=3D null)
+      reloadConfiguration();
+   }
+
+   public void reloadConfiguration() throws Exception
+   {
+      URL configURL =3D getConfigLocationURL();
+
+      try
       {
-         throw new Exception("The config " + configLocation + " does not e=
xist");
+         loadConfigurationAt(configURL);
       }
-      if (!URLTools.exists(configURL))
+      catch (Exception e)
       {
-         throw new Exception("The config " + configURL + " does not exist"=
);
+         if (config.exists())
+         {
+            log.debug("Configuration saved at " + config.getCanonicalPath()
+               + " is not loading properly. Falling back to default config=
uration.");
+            config.delete(); // delete improper config so that we retrieve=
 the default configuration
+            loadConfigurationAt(getConfigLocationURL());
+         }
       }
+   }
 =

+   private void loadConfigurationAt(URL configURL) throws JBossXBException=
, IOException
+   {
       log.debug("About to parse producer configuration " + configURL);
       Unmarshaller unmarshaller =3D UnmarshallerFactory.newInstance().newU=
nmarshaller();
       ObjectModelFactory factory =3D new ProducerConfigurationFactory();
       configuration =3D (ProducerConfiguration)unmarshaller.unmarshal(conf=
igURL.openStream(), factory, null);
    }
+
+   private URL getConfigLocationURL() throws Exception
+   {
+      if (!config.exists())
+      {
+         // Setup URLs
+         if (configLocation =3D=3D null)
+         {
+            throw new Exception("The config location is null");
+         }
+
+         // make sure we pick the furthest down the path in case there's s=
everal similarly named resources in the path
+         Enumeration resources =3D Thread.currentThread().getContextClassL=
oader().getResources(configLocation);
+         URL configURL =3D null;
+         while (resources.hasMoreElements())
+         {
+            configURL =3D (URL)resources.nextElement();
+         }
+
+         if (configURL =3D=3D null)
+         {
+            throw new Exception("The config " + configLocation + " does no=
t exist");
+         }
+         if (!URLTools.exists(configURL))
+         {
+            throw new Exception("The config " + configURL + " does not exi=
st");
+         }
+         return configURL;
+      }
+      else
+      {
+         return config.toURL();
+      }
+   }
+
+   public void saveConfiguration() throws Exception
+   {
+      // get the output writer to write the XML content
+      StringWriter xmlOutput =3D new StringWriter();
+
+      // get the XML Schema source
+      InputStream is =3D Thread.currentThread().getContextClassLoader().ge=
tResourceAsStream("xsd/jboss-wsrp-producer_2_6.xsd");
+
+      Reader xsReader =3D new InputStreamReader(is);
+
+      // create an instance of XML Schema marshaller
+      XercesXsMarshaller marshaller =3D new XercesXsMarshaller();
+
+      // we need to specify what elements are top most (roots) providing n=
amespace URI, prefix and local name
+      marshaller.addRootElement("urn:jboss:portal:wsrp:producer:v2_6", "",=
 "producer-configuration");
+
+      // declare default namespace
+      marshaller.declareNamespace(null, "urn:jboss:portal:wsrp:producer:v2=
_6");
+
+      // add schema location by declaring xsi namespace and adding xsi:sch=
emaLocation attribute
+      marshaller.declareNamespace("xsi", "http://www.w3.org/2001/XMLSchema=
-instance");
+      marshaller.addAttribute("xsi", "schemaLocation", "string", "urn:jbos=
s:portal:wsrp:producer:v2_6 xsd/jboss-wsrp-producer_2_6.xsd");
+
+      // create an instance of Object Model Provider
+      ObjectModelProvider provider =3D new ProducerConfigurationProvider();
+
+      marshaller.setProperty("org.jboss.xml.binding.marshalling.indent", "=
true");
+      marshaller.marshal(xsReader, provider, configuration, xmlOutput);
+
+      // close XML Schema reader
+      xsReader.close();
+
+      config.createNewFile();
+      Writer configFile =3D new BufferedWriter(new FileWriter(config));
+      configFile.write(xmlOutput.toString());
+      configFile.flush();
+      configFile.close();
+   }
 }

Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/Pr=
oducerRegistrationRequirementsImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/Producer=
RegistrationRequirementsImpl.java	2007-10-05 15:50:22 UTC (rev 8541)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/Producer=
RegistrationRequirementsImpl.java	2007-10-05 16:04:06 UTC (rev 8542)
@@ -192,9 +192,11 @@
       if (policy !=3D null)
       {
          policyClassName =3D policy.getClass().getName();
-         if (DEFAULT_POLICY_CLASS_NAME.equals(policyClassName))
+
+         if (policy instanceof DefaultRegistrationPolicy)
          {
-            validatorClassName =3D ((DefaultRegistrationPolicy)policy).get=
Validator().getClass().getName();
+            DefaultRegistrationPolicy registrationPolicy =3D (DefaultRegis=
trationPolicy)policy;
+            validatorClassName =3D registrationPolicy.getValidator().getCl=
ass().getName();
          }
       }
    }
@@ -212,7 +214,7 @@
 =

    public void reloadPolicyFrom(String policyClassName, String validatorCl=
assName)
    {
-      if (policyClassName !=3D null)
+      if (policyClassName !=3D null && !DEFAULT_POLICY_CLASS_NAME.equals(p=
olicyClassName))
       {
          log.debug("Using registration policy: " + policyClassName);
          ClassLoader loader =3D Thread.currentThread().getContextClassLoad=
er();

Copied: trunk/wsrp/src/resources/portal-wsrp-sar/xsd (from rev 8541, branch=
es/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd)

Deleted: trunk/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2=
_6.xsd
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd=
/jboss-wsrp-producer_2_6.xsd	2007-10-05 15:50:22 UTC (rev 8541)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xs=
d	2007-10-05 16:04:06 UTC (rev 8542)
@@ -1,67 +0,0 @@
-<?xml version=3D"1.0"?>
-
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~~~
-  ~ JBoss, a division of Red Hat                                          =
    ~
-  ~ Copyright 2007, Red Hat Middleware, LLC, and individual               =
    ~
-  ~ contributors as indicated by the @authors tag. See the                =
    ~
-  ~ copyright.txt 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.              =
    ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~-->
-<xs:schema xmlns:xs=3D"http://www.w3.org/2001/XMLSchema"
-           targetNamespace=3D"urn:jboss:portal:wsrp:producer:v2_6"
-           xmlns=3D"urn:jboss:portal:wsrp:producer:v2_6"
-           xmlns:xml=3D"http://www.w3.org/XML/1998/namespace">
-
-   <xs:import namespace=3D"http://www.w3.org/XML/1998/namespace" schemaLoc=
ation=3D"http://www.w3.org/2001/xml.xsd"/>
-
-   <xs:element name=3D"producer-configuration">
-      <xs:complexType>
-         <xs:sequence>
-            <xs:element name=3D"registration-configuration" type=3D"Regist=
rationConfiguration"/>
-         </xs:sequence>
-         <xs:attribute name=3D"fullServiceDescriptionRequiresRegistration"=
 type=3D"xs:boolean" default=3D"false"/>
-      </xs:complexType>
-   </xs:element>
-
-   <xs:complexType name=3D"RegistrationConfiguration">
-      <xs:sequence>
-         <xs:element name=3D"registration-policy" type=3D"xs:string" minOc=
curs=3D"0"/>
-         <xs:element name=3D"registration-property-validator" type=3D"xs:s=
tring" minOccurs=3D"0"/>
-         <xs:element name=3D"registration-property-description" type=3D"Re=
gistrationPropertyDescription" minOccurs=3D"0"
-                     maxOccurs=3D"unbounded"/>
-      </xs:sequence>
-   </xs:complexType>
-
-   <xs:complexType name=3D"RegistrationPropertyDescription">
-      <xs:sequence>
-         <xs:element name=3D"name" type=3D"xs:string"/>
-         <xs:element name=3D"type" type=3D"xs:string"/>
-         <xs:element name=3D"label" type=3D"LocalizedString"/>
-         <xs:element name=3D"hint" type=3D"LocalizedString" minOccurs=3D"0=
"/>
-      </xs:sequence>
-   </xs:complexType>
-
-   <xs:complexType name=3D"LocalizedString">
-      <xs:simpleContent>
-         <xs:extension base=3D"xs:string">
-            <xs:attribute ref=3D"xml:lang" use=3D"required"/>
-            <xs:attribute name=3D"resourceName" type=3D"xs:string" use=3D"=
optional"/>
-         </xs:extension>
-      </xs:simpleContent>
-   </xs:complexType>
-</xs:schema>

Copied: trunk/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_=
6.xsd (from rev 8541, branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/p=
ortal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd)
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xs=
d	                        (rev 0)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xs=
d	2007-10-05 16:04:06 UTC (rev 8542)
@@ -0,0 +1,67 @@
+<?xml version=3D"1.0"?>
+
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~~~
+  ~ JBoss, a division of Red Hat                                          =
    ~
+  ~ Copyright 2007, Red Hat Middleware, LLC, and individual               =
    ~
+  ~ contributors as indicated by the @authors tag. See the                =
    ~
+  ~ copyright.txt 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.              =
    ~
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~=
~~~-->
+<xs:schema xmlns:xs=3D"http://www.w3.org/2001/XMLSchema"
+           targetNamespace=3D"urn:jboss:portal:wsrp:producer:v2_6"
+           xmlns=3D"urn:jboss:portal:wsrp:producer:v2_6"
+           xmlns:xml=3D"http://www.w3.org/XML/1998/namespace">
+
+   <xs:import namespace=3D"http://www.w3.org/XML/1998/namespace" schemaLoc=
ation=3D"http://www.w3.org/2001/xml.xsd"/>
+
+   <xs:element name=3D"producer-configuration">
+      <xs:complexType>
+         <xs:sequence>
+            <xs:element name=3D"registration-configuration" type=3D"Regist=
rationConfiguration"/>
+         </xs:sequence>
+         <xs:attribute name=3D"fullServiceDescriptionRequiresRegistration"=
 type=3D"xs:boolean" default=3D"false"/>
+      </xs:complexType>
+   </xs:element>
+
+   <xs:complexType name=3D"RegistrationConfiguration">
+      <xs:sequence>
+         <xs:element name=3D"registration-policy" type=3D"xs:string" minOc=
curs=3D"0"/>
+         <xs:element name=3D"registration-property-validator" type=3D"xs:s=
tring" minOccurs=3D"0"/>
+         <xs:element name=3D"registration-property-description" type=3D"Re=
gistrationPropertyDescription" minOccurs=3D"0"
+                     maxOccurs=3D"unbounded"/>
+      </xs:sequence>
+   </xs:complexType>
+
+   <xs:complexType name=3D"RegistrationPropertyDescription">
+      <xs:sequence>
+         <xs:element name=3D"name" type=3D"xs:string"/>
+         <xs:element name=3D"type" type=3D"xs:string"/>
+         <xs:element name=3D"label" type=3D"LocalizedString"/>
+         <xs:element name=3D"hint" type=3D"LocalizedString" minOccurs=3D"0=
"/>
+      </xs:sequence>
+   </xs:complexType>
+
+   <xs:complexType name=3D"LocalizedString">
+      <xs:simpleContent>
+         <xs:extension base=3D"xs:string">
+            <xs:attribute ref=3D"xml:lang" use=3D"required"/>
+            <xs:attribute name=3D"resourceName" type=3D"xs:string" use=3D"=
optional"/>
+         </xs:extension>
+      </xs:simpleContent>
+   </xs:complexType>
+</xs:schema>


--===============2031058216464742215==--