jboss-svn-commits — JBoss SVN commit notifications

[Jboss-svn-commits] JBL Code SVN: r4944 - labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects

[<jbo...@li...>]

Author: unibrew
Date: 2006-07-07 10:44:59 -0400 (Fri, 07 Jul 2006)
New Revision: 4944

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
Log:
[JBLAB-682] Integrating DownloadsDescriptor's parsing into ProjectDescriptor.

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2006-07-07 14:39:39 UTC (rev 4943)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2006-07-07 14:44:59 UTC (rev 4944)
@@ -59,6 +59,11 @@
      * <code>CAT_ID_SEPARATOR</code> - a separator of category ids.
      */
     public final static String CAT_ID_SEPARATOR = "/";
+    
+    /**
+     * Name of the XML element under which downloads are described.
+     */
+    public final static String DOWNLOADS_ELEMENT = "downloads";
 
     private Map<String, DownloadsDescriptor> categories;
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java	2006-07-07 14:39:39 UTC (rev 4943)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java	2006-07-07 14:44:59 UTC (rev 4944)
@@ -50,13 +50,12 @@
  * @author adamw
  */
 public class ProjectDescriptor extends AbstractDescriptor {
-	private static final Logger log = Logger.getLogger(ProjectDescriptor.class);
 	
-	private DownloadsDescriptor downloads;
+    private static final Logger log = Logger.getLogger(ProjectDescriptor.class);
 
-	private String portalName;
+    private String portalName;
 
-	private ElementDescriptor thisProject;
+    private ElementDescriptor thisProject;
 
     private Node menuNode;
     private Menu menu;
@@ -67,9 +66,9 @@
     private Node issueTrackerNode;
     private IssueTracker issueTracker;
 
-    // TODO: HACK
     private Node downloadsNode;
-
+    private DownloadsDescriptor downloads;
+    
     /**
 	 * Reads information about a project from an xml file.
 	 * 
@@ -213,7 +212,7 @@
                 if (IssueTracker.ISSUE_TRACKER_ELEMENT.equals(node.getNodeName())) {
                     setIssueTrackerNode(node);
                 }
-                if ("downloads".equals(node.getNodeName())) {
+                if (DownloadsDescriptor.DOWNLOADS_ELEMENT.equals(node.getNodeName())) {
                     downloadsNode=node;
                 }
 			}

[Jboss-svn-commits] JBossWS SVN: r578 - branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb

[<jbo...@li...>]

Author: hei...@jb...
Date: 2006-07-07 10:39:55 -0400 (Fri, 07 Jul 2006)
New Revision: 578

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBMarshallerImpl.java
Log:
Use XB cache by default

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBMarshallerImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBMarshallerImpl.java	2006-07-07 13:09:33 UTC (rev 577)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBMarshallerImpl.java	2006-07-07 14:39:55 UTC (rev 578)
@@ -64,7 +64,7 @@
    public JBossXBMarshallerImpl()
    {
 
-      ClassInfos.disableCache();
+      //ClassInfos.disableCache();
 
       delegate = new MarshallerImpl();
       delegate.setProperty(org.jboss.xb.binding.Marshaller.PROP_OUTPUT_XML_VERSION, "false");

[Jboss-svn-commits] JBL Code SVN: r4943 - labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects

[<jbo...@li...>]

Author: unibrew
Date: 2006-07-07 10:39:39 -0400 (Fri, 07 Jul 2006)
New Revision: 4943

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
Log:
[JBLAB-682] Clearing the code.

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2006-07-07 13:50:53 UTC (rev 4942)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2006-07-07 14:39:39 UTC (rev 4943)
@@ -30,7 +30,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.xerces.parsers.DOMParser;
 import org.jboss.forge.common.ForgeHelper;
 import org.jboss.forge.common.projects.XmlInputFactory.XmlNotFoundException;
 import org.jboss.forge.common.projects.elements.BindingsHandlerIterSingleKey;
@@ -45,7 +44,6 @@
 import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
 import org.jboss.forge.common.projects.permissions.PermissionsChecker;
 import org.jboss.portal.common.context.DelegateContext;
-import org.w3c.dom.Document;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.SAXException;
@@ -89,13 +87,6 @@
      * @throws IOException
      * @throws XmlNotFoundException
      */
-     /*public DownloadsDescriptor(XmlInputFactory isf, DomToXmlTransformer xht,
-            String componentDir, String componentDesc, String portalName,
-            String projectId) throws SAXException, IOException,
-            XmlNotFoundException {
-        this(isf, xht, "", "", componentDir, componentDesc, portalName,
-               projectId, null);
-     }*/
      public DownloadsDescriptor(XmlInputFactory isf, DomToXmlTransformer xht,
                   Node node, String componentDir, String componentDesc, String portalName,
                   String projectId) throws SAXException, IOException,
@@ -131,35 +122,15 @@
          ElementsDescriptor filesDesc = null;      
 
          Node n;
-         NodeList nodes = node.getChildNodes();    
-
-        System.out.println("---------------------");
-        System.out.println("ENTERING PARSING OF NODE");
-        System.out.println("ROOT NODENAME: "+node.getNodeName() +" NODEVALUE: "+node.getNodeValue());
-        for (int i =0; i<nodes.getLength();i++) {
-            if (nodes.item(i).getNodeType() == Node.ELEMENT_NODE) 
-            System.out.println("SUBNODE NAME: "+nodes.item(i).getNodeName()+" NODEVALUE: "+nodes.item(i).getNodeValue());
-        }
-        System.out.println("---------------------");
-
-
-
-
-
-
-
+         NodeList nodes = node.getChildNodes();
+         
          // Parsing the descriptor
          // If there's no parent category info, we look for a "root-category"
          // tag.
-         System.out.println("BEFORE NODENAME: "+node.getNodeName());
         if (thisCategory == null) {
-            System.out.println("IN IF");
             if (node.getNodeType() == Node.ELEMENT_NODE) {
-                System.out.println("IN ELEMENT");
                 thisCategory = new ElementDescriptor(node, xht, new PropertiesHandlerDefault());
                 categoryNameContext = thisCategory.getProperty("name");
-                System.out.println("CATEGORY NAME: "+categoryNameContext);
-               // categoryDescription = thisCategory.getProperty("description");
             }
         }
 
@@ -168,16 +139,13 @@
              n = nodes.item(i);
 
              if (n.getNodeType() == Node.ELEMENT_NODE) {
-                System.out.println("PARSING ZA NODETYPE: "+n.getNodeName());
                  if (n.getNodeName().equals("categories")) {
-                    System.out.println("W KATEGORIACH");
                      categoriesDesc = new ElementsDescriptor(n, xht, "category",
                              getCategoriesPropertiesHandler(isf,xht,n,
                                       categoryContext,categoryNameContext,
                                       componentDir, componentDesc,
                                       portalName, projectId ));
                  } else if (n.getNodeName().equals("files")) {
-                    System.out.println("W PLIKACH");
                      filesDesc = new ElementsDescriptor(n, xht, "file",
                              getFilesPropertiesHandler(isf, projectId,
                                      downloadPrefix, pathCategoryContext,
@@ -251,138 +219,7 @@
      * @throws IOException
      * @throws XmlNotFoundException
      */
-   /*  private DownloadsDescriptor(XmlInputFactory isf, DomToXmlTransformer xht,
-            String categoryContext, String categoryNameContext,
-            String componentDir, String componentDesc, String portalName,
-            String projectId, ElementDescriptor thisCategory)
-            throws SAXException, IOException, XmlNotFoundException {
-        this.categoryContext = categoryContext;
-        categories = new HashMap<String, DownloadsDescriptor>();
-        context = new DelegateContext();
-
-        // File name components separator
-        String separator = "/";
-
-        // Prefix to prepend to each file path to make a component link
-        String downloadPrefix = separator + ForgeHelper.FILE_ACCESS_DIR
-                + separator + portalName + separator
-                + ProjectsHelper.MEMBERS_DIR + separator + projectId
-                + separator + componentDir;
-
-        // Getting the category which has a path-like structure, not the
-        // web-address-like structure
-        String pathCategoryContext = categoryContext.replaceAll("["
-                + CAT_ID_SEPARATOR + "]", separator);
-
-        // The isf is already suffixed with the members directory, so we just
-        // need to add <project id>/<path prefix = component type>/<category
-        // context>
-        String isfPathPrefix = separator + projectId + separator + componentDir
-                + separator + pathCategoryContext;
-
-        // Descriptors of categories and files that are contained in this
-        // category.
-        ElementsDescriptor categoriesDesc = null;
-        ElementsDescriptor filesDesc = null;
-
-        // Getting the categories and files descriptors
-        DOMParser parser = new DOMParser();
-        parser.parse(isf.getInputSource(isfPathPrefix + separator
-                + componentDesc));
-        Document doc = parser.getDocument();
-
-        Node n;
-        NodeList nodes = doc.getDocumentElement().getChildNodes();
-
-
-
-        //TODO: BECOMES OUTDATED
-
-
-        // Parsing the descriptor
-        // If there's no parent category info, we look for a "root-category"
-        // tag.
-        if (thisCategory == null)
-            for (int i = 0; i < nodes.getLength(); i++) {
-                n = nodes.item(i);
-
-                if (n.getNodeType() == Node.ELEMENT_NODE) {
-                    if (n.getNodeName().equals("root-category")) {
-                        thisCategory = new ElementDescriptor(n, xht,
-                                new PropertiesHandlerDefault());
-                        categoryNameContext = thisCategory.getProperty("name");
-                    }
-                }
-            }     
-            
-        // If there's still no root category info, we throw an exception.
-        if (thisCategory == null)
-            throw new SAXException();
-            
-        //TODO:  BECOMES OUTDATED
-            
-            
-
-        // Parsing child categories and files descriptors.
-        for (int i = 0; i < nodes.getLength(); i++) {
-            n = nodes.item(i);
-
-            if (n.getNodeType() == Node.ELEMENT_NODE) {
-                if (n.getNodeName().equals("categories")) {
-                    categoriesDesc = new ElementsDescriptor(n, xht, "category",
-                            getCategoriesPropertiesHandler(isf, xht,
-                                    portalName, projectId, categoryContext,
-                                    categoryNameContext,componentDir, componentDesc));
-                } else if (n.getNodeName().equals("files")) {
-                    filesDesc = new ElementsDescriptor(n, xht, "file",
-                            getFilesPropertiesHandler(isf, projectId,
-                                    downloadPrefix, pathCategoryContext,
-                                    separator,componentDir),
-                            getFilesExtendedPropertiesMap(downloadPrefix,
-                            		pathCategoryContext, separator, portalName,
-                            		projectId),
-                            new OutsidePropertiesMap());
-                }
-            }
-        }
-
-
-        //TODO: BECOMES OUTDATED
-        if (thisCategory != null)
-            thisCategory.fillContext(context, new NullPermissionsChecker());
-        //TODO: BECOMES OUTDATED
-        
-        
-            
-        if (categoriesDesc != null) 
-        	categoriesDesc.fillContext(context.next("hasCategories"), "categories",
-        			new NullPermissionsChecker());
-        if (filesDesc != null)
-        	filesDesc.fillContext(context.next("hasFiles"), "files",
-        			new NullPermissionsChecker());
-
-        // Creating the trace (for each category, a path from from the root to
-        // that category).
-        String[] idTokens = categoryContext.split("[" + CAT_ID_SEPARATOR + "]");
-        String[] nameTokens = categoryNameContext.split("[" + CAT_ID_SEPARATOR
-                + "]");
-        String idPath = "";
-
-        DelegateContext rootTraceContext = context.next("trace");
-        rootTraceContext.put("id", "");
-        rootTraceContext.put("name", nameTokens[0]);
-
-        for (int i = 1; i < idTokens.length; i++) {
-            DelegateContext traceContext = context.next("trace");
-
-            idPath += CAT_ID_SEPARATOR + idTokens[i];
-
-            traceContext.put("id", idPath);
-            traceContext.put("name", nameTokens[i]);
-        }
-    }*/
-
-    private PropertiesHandler getCategoriesPropertiesHandler(
+     private PropertiesHandler getCategoriesPropertiesHandler(
             final XmlInputFactory isf, final DomToXmlTransformer xht, final Node node,
             final String categoryContext, final String categoryNameContext,
             final String componentDir, final String componentDesc,
@@ -516,7 +353,7 @@
                 	+ pathCategoryContext + separator + id;
                 
                 boolean outsideFile = false;
-                System.out.println("PUTTING IN CONTEXT FILE: "+id);
+
                 /*
                  * Checking if this is the link to a file is not an absolute
                  * one; if it is not, then we prepend the prefix that was
@@ -545,9 +382,9 @@
                 	context.put("release", properties.get("release").getFirstValue());
                 else
                 	/*
-					 * If this is an outside file, then we cannot determine its
-					 * release date.
-					 */
+                         * If this is an outside file, then we cannot determine its
+			 * release date.
+			 */
                 	if (!outsideFile)
                 		context.put("release", DateFormat.getDateInstance(
 							DateFormat.SHORT).format(

[Jboss-svn-commits] JBossWS SVN: r581 - branches/jbossws-1.0/src/main/java/org/jboss/ws/soap

[<jbo...@li...>]

Author: hei...@jb...
Date: 2006-07-07 10:42:36 -0400 (Fri, 07 Jul 2006)
New Revision: 581

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java
Log:
javadocs

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java	2006-07-07 14:41:58 UTC (rev 580)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPElementImpl.java	2006-07-07 14:42:36 UTC (rev 581)
@@ -67,7 +67,7 @@
    /** Called by SOAPFactory */
    public SOAPElementImpl(String localPart)
    {
-	   
+
       super(DOMUtils.createElement(localPart, null, null));
       this.element = (Element)domNode;
       log.trace("new SOAPElementImpl: " + getElementName());
@@ -102,10 +102,10 @@
       SOAPElement soapElement = this;
       while (soapElement != null && (soapElement instanceof SOAPEnvelope) == false)
          soapElement = soapElement.getParentElement();
-      
+
       return (SOAPEnvelope)soapElement;
    }
-   
+
    //  javax.xml.soap.SOAPElement *************************************************************************************
 
    /**
@@ -225,8 +225,7 @@
     *
     * @param prefix a String giving the prefix of the namespace
     * @param nsURI    a String giving the uri of the namespace
-    * @return the SOAPElement object into which this namespace declaration was inserted.
-    * @throws javax.xml.soap.SOAPException if there is an error in creating the namespace
+    * @return the SOAPElement object into which this namespace declaration was inserted.    
     */
    public SOAPElement addNamespaceDeclaration(String prefix, String nsURI)
    {

[Jboss-svn-commits] JBossWS SVN: r580 - branches/jbossws-1.0/src/main/java/org/jboss/ws/soap

[<jbo...@li...>]

Author: hei...@jb...
Date: 2006-07-07 10:41:58 -0400 (Fri, 07 Jul 2006)
New Revision: 580

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
Log:
remove unused atributes

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java	2006-07-07 14:40:10 UTC (rev 579)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/soap/SOAPContentElement.java	2006-07-07 14:41:58 UTC (rev 580)
@@ -77,7 +77,6 @@
    // True while expanding to DOM
    private boolean expandingToDOM;
 
-   private String xopFragement = null;
    // The associated parameter
    private ParameterMetaData paramMetaData;
 

[Jboss-svn-commits] JBossWS SVN: r579 - branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb

[<jbo...@li...>]

Author: hei...@jb...
Date: 2006-07-07 10:40:10 -0400 (Fri, 07 Jul 2006)
New Revision: 579

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBUnmarshallerImpl.java
Log:
Use XB cache by default

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBUnmarshallerImpl.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBUnmarshallerImpl.java	2006-07-07 14:39:55 UTC (rev 578)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/jaxb/JBossXBUnmarshallerImpl.java	2006-07-07 14:40:10 UTC (rev 579)
@@ -51,8 +51,8 @@
    public Object unmarshal(InputStream is) throws UnmarshalException
    {
 
-      ClassInfos.disableCache();
-
+      //ClassInfos.disableCache();
+      
       assertRequiredProperties();
 
       org.jboss.xb.binding.Unmarshaller unm = UnmarshallerFactory.newInstance().newUnmarshaller();

[Jboss-svn-commits] JBL Code SVN: r4942 - labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects

[<jbo...@li...>]

Author: unibrew
Date: 2006-07-07 09:50:53 -0400 (Fri, 07 Jul 2006)
New Revision: 4942

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
Log:
[JBLAB-682] Repairing download categories

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2006-07-07 02:45:08 UTC (rev 4941)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadsDescriptor.java	2006-07-07 13:50:53 UTC (rev 4942)
@@ -133,6 +133,21 @@
          Node n;
          NodeList nodes = node.getChildNodes();    
 
+        System.out.println("---------------------");
+        System.out.println("ENTERING PARSING OF NODE");
+        System.out.println("ROOT NODENAME: "+node.getNodeName() +" NODEVALUE: "+node.getNodeValue());
+        for (int i =0; i<nodes.getLength();i++) {
+            if (nodes.item(i).getNodeType() == Node.ELEMENT_NODE) 
+            System.out.println("SUBNODE NAME: "+nodes.item(i).getNodeName()+" NODEVALUE: "+nodes.item(i).getNodeValue());
+        }
+        System.out.println("---------------------");
+
+
+
+
+
+
+
          // Parsing the descriptor
          // If there's no parent category info, we look for a "root-category"
          // tag.
@@ -385,7 +400,7 @@
                 String categoryId = thisElement.getId();
                 try {
                     categories.put(categoryId, new DownloadsDescriptor(isf,
-                            xht,node, categoryContext + CAT_ID_SEPARATOR
+                            xht,node.getParentNode(), categoryContext + CAT_ID_SEPARATOR
                                     + categoryId, categoryNameContext
                                     + CAT_ID_SEPARATOR
                                     + thisElement.getProperty("name"),
@@ -501,7 +516,7 @@
                 	+ pathCategoryContext + separator + id;
                 
                 boolean outsideFile = false;
-                
+                System.out.println("PUTTING IN CONTEXT FILE: "+id);
                 /*
                  * Checking if this is the link to a file is not an absolute
                  * one; if it is not, then we prepend the prefix that was

[Jboss-svn-commits] JBossWS SVN: r577 - trunk/src/main/java/org/jboss/ws/integration

[<jbo...@li...>]

Author: tho...@jb...
Date: 2006-07-07 09:09:33 -0400 (Fri, 07 Jul 2006)
New Revision: 577

Removed:
   trunk/src/main/java/org/jboss/ws/integration/tomcat/
Log:
remove tomcat

[Jboss-svn-commits] JBossWS SVN: r576 - branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss

[<jbo...@li...>]

Author: hei...@jb...
Date: 2006-07-07 06:12:56 -0400 (Fri, 07 Jul 2006)
New Revision: 576

Modified:
   branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointPublisher.java
Log:
comments

Modified: branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointPublisher.java
===================================================================
--- branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointPublisher.java	2006-07-07 08:10:20 UTC (rev 575)
+++ branches/jbossws-1.0/src/main/java/org/jboss/ws/integration/jboss/JBossServiceEndpointPublisher.java	2006-07-07 10:12:56 UTC (rev 576)
@@ -36,7 +36,7 @@
 import org.jboss.ws.deployment.UnifiedDeploymentInfo;
 
 /**
- * Publish the HTTP service endpoint to Tomcat 
+ * Publish the HTTP service endpoint to JBoss 
  * 
  * @author Tho...@jb...
  * @since 12-May-2006

[Jboss-svn-commits] JBossWS SVN: r575 - trunk

[<jbo...@li...>]

Author: tho...@jb...
Date: 2006-07-07 04:10:20 -0400 (Fri, 07 Jul 2006)
New Revision: 575

Modified:
   trunk/build.xml
Log:
JBWS-1000: jbossws-thirdparty.jar seems to be missing

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2006-07-07 08:10:09 UTC (rev 574)
+++ trunk/build.xml	2006-07-07 08:10:20 UTC (rev 575)
@@ -452,7 +452,7 @@
     </antcall>
   </target>
 
-  <!-- Deploy to jboss --> 
+  <!-- Deploy to jboss -->
   <target name="deploy-to-server">
     <copy todir="${jboss.deploy.home}/client" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
     <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
@@ -460,13 +460,13 @@
     <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar" src="${build.lib.dir}/${jbossws}.sar"/>
   </target>
 
-  <!-- Deploy to jboss/thirdparty --> 
+  <!-- Deploy to jboss/thirdparty -->
   <target name="deploy-to-thirdparty" if="jboss.source.dist.available">
     <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
     <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
   </target>
 
-  <!-- Deploy to Tomcat --> 
+  <!-- Deploy to Tomcat -->
   <target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
     <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
     <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
@@ -502,7 +502,7 @@
     </jar>
     <delete dir="${build.lib.dir}/build"/>
   </target>
-  
+
   <!-- ================================================================== -->
   <!-- Release                                                            -->
   <!-- ================================================================== -->
@@ -554,7 +554,7 @@
 
   <target name="most" description="Builds almost everything." depends="jars"/>
 
-  <target name="all" description="Create a distribution zip file" depends="main,module-jars14,build-samples,build-docs">
+  <target name="all" description="Create a distribution zip file" depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
 
     <mkdir dir="${build.dist.dir}"/>
     <mkdir dir="${build.dist.dir}/bin"/>
@@ -594,12 +594,12 @@
     <copy todir="${build.dist.dir}/lib/jboss-jdk1.5" overwrite="true">
       <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
     </copy>
-    
+
     <!-- lib/jdk1.4 -->
     <copy todir="${build.dist.dir}/lib/jboss-jdk1.4" overwrite="true">
       <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/>
     </copy>
-    
+
     <!-- lib/tomcat -->
     <copy todir="${build.dist.dir}/lib/tomcat/common/endorsed" overwrite="true">
       <fileset dir="${thirdparty.dir}">

[Jboss-svn-commits] JBossWS SVN: r574 - branches/jbossws-1.0

[<jbo...@li...>]

Author: tho...@jb...
Date: 2006-07-07 04:10:09 -0400 (Fri, 07 Jul 2006)
New Revision: 574

Modified:
   branches/jbossws-1.0/build.xml
Log:
JBWS-1000: jbossws-thirdparty.jar seems to be missing

Modified: branches/jbossws-1.0/build.xml
===================================================================
--- branches/jbossws-1.0/build.xml	2006-07-07 08:09:52 UTC (rev 573)
+++ branches/jbossws-1.0/build.xml	2006-07-07 08:10:09 UTC (rev 574)
@@ -452,7 +452,7 @@
     </antcall>
   </target>
 
-  <!-- Deploy to jboss --> 
+  <!-- Deploy to jboss -->
   <target name="deploy-to-server">
     <copy todir="${jboss.deploy.home}/client" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
     <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
@@ -460,13 +460,13 @@
     <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar" src="${build.lib.dir}/${jbossws}.sar"/>
   </target>
 
-  <!-- Deploy to jboss/thirdparty --> 
+  <!-- Deploy to jboss/thirdparty -->
   <target name="deploy-to-thirdparty" if="jboss.source.dist.available">
     <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
     <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
   </target>
 
-  <!-- Deploy to Tomcat --> 
+  <!-- Deploy to Tomcat -->
   <target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
     <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
     <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
@@ -502,7 +502,7 @@
     </jar>
     <delete dir="${build.lib.dir}/build"/>
   </target>
-  
+
   <!-- ================================================================== -->
   <!-- Release                                                            -->
   <!-- ================================================================== -->
@@ -554,7 +554,7 @@
 
   <target name="most" description="Builds almost everything." depends="jars"/>
 
-  <target name="all" description="Create a distribution zip file" depends="main,module-jars14,build-samples,build-docs">
+  <target name="all" description="Create a distribution zip file" depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
 
     <mkdir dir="${build.dist.dir}"/>
     <mkdir dir="${build.dist.dir}/bin"/>
@@ -594,12 +594,12 @@
     <copy todir="${build.dist.dir}/lib/jboss-jdk1.5" overwrite="true">
       <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
     </copy>
-    
+
     <!-- lib/jdk1.4 -->
     <copy todir="${build.dist.dir}/lib/jboss-jdk1.4" overwrite="true">
       <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/>
     </copy>
-    
+
     <!-- lib/tomcat -->
     <copy todir="${build.dist.dir}/lib/tomcat/common/endorsed" overwrite="true">
       <fileset dir="${thirdparty.dir}">

[Jboss-svn-commits] JBossWS SVN: r573 - tags/jbossws-1.0.1.GA

[<jbo...@li...>]

Author: tho...@jb...
Date: 2006-07-07 04:09:52 -0400 (Fri, 07 Jul 2006)
New Revision: 573

Modified:
   tags/jbossws-1.0.1.GA/build.xml
Log:
JBWS-1000: jbossws-thirdparty.jar seems to be missing

Modified: tags/jbossws-1.0.1.GA/build.xml
===================================================================
--- tags/jbossws-1.0.1.GA/build.xml	2006-07-06 11:38:57 UTC (rev 572)
+++ tags/jbossws-1.0.1.GA/build.xml	2006-07-07 08:09:52 UTC (rev 573)
@@ -450,7 +450,7 @@
     </antcall>
   </target>
 
-  <!-- Deploy to jboss --> 
+  <!-- Deploy to jboss -->
   <target name="deploy-to-server">
     <copy todir="${jboss.deploy.home}/client" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
     <delete dir="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar"/>
@@ -458,13 +458,13 @@
     <unjar dest="${jboss.deploy.home}/server/${jboss.server.instance}/deploy/${jbossws}.sar" src="${build.lib.dir}/${jbossws}.sar"/>
   </target>
 
-  <!-- Deploy to jboss/thirdparty --> 
+  <!-- Deploy to jboss/thirdparty -->
   <target name="deploy-to-thirdparty" if="jboss.source.dist.available">
     <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}-client.jar" overwrite="true"/>
     <copy todir="${jboss.deploy.home}/../../../thirdparty/jboss/${jbossws}/lib" file="${build.lib.dir}/${jbossws}.sar" overwrite="true"/>
   </target>
 
-  <!-- Deploy to Tomcat --> 
+  <!-- Deploy to Tomcat -->
   <target name="deploy-tomcat" depends="main,jbossws-thirdparty-jar" description="Deploy JBossWS to Tomcat">
     <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/serializer.jar"/>
     <copy todir="${tomcat.common.dir}/endorsed" file="${thirdparty.dir}/xalan.jar"/>
@@ -500,7 +500,7 @@
     </jar>
     <delete dir="${build.lib.dir}/build"/>
   </target>
-  
+
   <!-- ================================================================== -->
   <!-- Release                                                            -->
   <!-- ================================================================== -->
@@ -552,7 +552,7 @@
 
   <target name="most" description="Builds almost everything." depends="jars"/>
 
-  <target name="all" description="Create a distribution zip file" depends="main,module-jars14,build-samples,build-docs">
+  <target name="all" description="Create a distribution zip file" depends="main,module-jars14,jbossws-thirdparty-jar,build-samples,build-docs">
 
     <mkdir dir="${build.dist.dir}"/>
     <mkdir dir="${build.dist.dir}/bin"/>
@@ -592,12 +592,12 @@
     <copy todir="${build.dist.dir}/lib/jboss-jdk1.5" overwrite="true">
       <fileset dir="${build.lib.dir}" includes="jbossws-client.jar,jbossws.sar"/>
     </copy>
-    
+
     <!-- lib/jdk1.4 -->
     <copy todir="${build.dist.dir}/lib/jboss-jdk1.4" overwrite="true">
       <fileset dir="${build.lib.dir}" includes="jbossws14-client.jar,jbossws14.sar"/>
     </copy>
-    
+
     <!-- lib/tomcat -->
     <copy todir="${build.dist.dir}/lib/tomcat/common/endorsed" overwrite="true">
       <fileset dir="${thirdparty.dir}">

[Jboss-svn-commits] JBL Code SVN: r4940 - in labs/jbossrules/trunk/drools-jsr94/src: main/java/org/drools/jsr94/rules test/java/org/drools/jsr94/rules

[<jbo...@li...>]

Author: mar...@jb...
Date: 2006-07-06 22:31:27 -0400 (Thu, 06 Jul 2006)
New Revision: 4940

Modified:
   labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/RuleServiceProviderImpl.java
   labs/jbossrules/trunk/drools-jsr94/src/test/java/org/drools/jsr94/rules/RuleServiceProviderTest.java
Log:
JBRULES-362 RuleServiceProviderImpl does not register itself

Modified: labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/RuleServiceProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/RuleServiceProviderImpl.java	2006-07-07 02:28:30 UTC (rev 4939)
+++ labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/RuleServiceProviderImpl.java	2006-07-07 02:31:27 UTC (rev 4940)
@@ -16,8 +16,10 @@
  * limitations under the License.
  */
 
+import javax.rules.ConfigurationException;
 import javax.rules.RuleRuntime;
 import javax.rules.RuleServiceProvider;
+import javax.rules.RuleServiceProviderManager;
 import javax.rules.admin.RuleAdministrator;
 
 import org.drools.jsr94.rules.admin.RuleAdministratorImpl;
@@ -32,6 +34,8 @@
  * provided by Drools should be retrieved using a JNDI lookup. <p/> This class
  * should be constructed using the
  * <code>RuleServiceProviderManager.getRuleServiceProvider</code> method.
+ * This class is automatically registered to "http://drools.org/" on startup, 
+ * via the static block.
  * 
  * @see RuleRuntimeImpl
  * @see RuleAdministratorImpl
@@ -41,6 +45,8 @@
  * @author <a href="mailto:tho...@so...">thomas diesler </a>
  */
 public class RuleServiceProviderImpl extends RuleServiceProvider {
+    public static final String         RULE_SERVICE_PROVIDER = "http://drools.org/";
+
     /** An instance of <code>RuleRuntimeImpl</code>. */
     private RuleRuntime                ruleRuntime;
 
@@ -49,6 +55,15 @@
 
     private RuleExecutionSetRepository repository;
 
+    static {
+        try {
+            RuleServiceProviderManager.registerRuleServiceProvider( RULE_SERVICE_PROVIDER,
+                                                                    RuleServiceProviderImpl.class );
+        } catch ( ConfigurationException e ) {
+            System.err.println( "Unable to regiser Rule Service  Provider " + RULE_SERVICE_PROVIDER );
+        }
+    }
+
     /**
      * Create a new <code>RuleServiceProviderImpl</code>.
      */
@@ -57,13 +72,15 @@
     }
 
     /**
+     * Returns the RuleExecutionSetRepository
      * @return
      */
     public synchronized RuleExecutionSetRepository getRepository() {
-        if ( this.repository != null ) {
-            return this.repository;
+        // Lazy loaded
+        if ( this.repository == null ) {
+            this.repository = new RuleExecutionSetRepository();
         }
-        return this.repository = new RuleExecutionSetRepository();
+        return this.repository;
     }
 
     /**
@@ -73,10 +90,11 @@
      * @return an instance of <code>RuleRuntime</code>
      */
     public synchronized RuleRuntime getRuleRuntime() {
-        if ( this.ruleRuntime != null ) {
-            return this.ruleRuntime;
+        if ( this.ruleRuntime == null ) {
+            this.ruleRuntime = new RuleRuntimeImpl( getRepository() );
         }
-        return this.ruleRuntime = new RuleRuntimeImpl( getRepository() );
+        
+        return this.ruleRuntime;       
     }
 
     /**
@@ -87,9 +105,10 @@
      * @return an instance of <code>RuleAdministrator</code>
      */
     public synchronized RuleAdministrator getRuleAdministrator() {
-        if ( this.ruleAdministrator != null ) {
-            return this.ruleAdministrator;
+        // Lazy instantiate
+        if ( this.ruleAdministrator == null ) {
+            this.ruleAdministrator = new RuleAdministratorImpl( getRepository() );
         }
-        return this.ruleAdministrator = new RuleAdministratorImpl( getRepository() );
+        return this.ruleAdministrator;
     }
 }

Modified: labs/jbossrules/trunk/drools-jsr94/src/test/java/org/drools/jsr94/rules/RuleServiceProviderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/test/java/org/drools/jsr94/rules/RuleServiceProviderTest.java	2006-07-07 02:28:30 UTC (rev 4939)
+++ labs/jbossrules/trunk/drools-jsr94/src/test/java/org/drools/jsr94/rules/RuleServiceProviderTest.java	2006-07-07 02:31:27 UTC (rev 4940)
@@ -42,34 +42,44 @@
  */
 
 import javax.rules.RuleRuntime;
+import javax.rules.RuleServiceProvider;
+import javax.rules.RuleServiceProviderManager;
 import javax.rules.admin.RuleAdministrator;
 
+import junit.framework.TestCase;
+
 /**
  * Test the RuleServiceProvider implementation.
  *
  * @author N. Alex Rupp (n_alex <at>codehaus.org)
  * @author <a href="mailto:tho...@so...">thomas diesler </a>
  */
-public class RuleServiceProviderTest extends RuleEngineTestBase {
+public class RuleServiceProviderTest extends TestCase {
     /**
      * Test getRuleRuntime.
      */
     public void testRuleRuntime() throws Exception {
-        final RuleRuntime ruleRuntime = this.ruleServiceProvider.getRuleRuntime();
+        Class.forName("org.drools.jsr94.rules.RuleServiceProviderImpl");
+        RuleServiceProvider ruleServiceProvider = RuleServiceProviderManager.getRuleServiceProvider("http://drools.org/");
+        
+        final RuleRuntime ruleRuntime = ruleServiceProvider.getRuleRuntime();
         assertNotNull( "cannot obtain RuleRuntime",
                        ruleRuntime );
         assertTrue( "not a class instance",
-                    ruleRuntime == this.ruleServiceProvider.getRuleRuntime() );
+                    ruleRuntime == ruleServiceProvider.getRuleRuntime() );
     }
 
     /**
      * Test getRuleAdministrator.
      */
     public void testRuleAdministrator() throws Exception {
-        final RuleAdministrator ruleAdministrator = this.ruleServiceProvider.getRuleAdministrator();
+        Class.forName("org.drools.jsr94.rules.RuleServiceProviderImpl");
+        RuleServiceProvider ruleServiceProvider = RuleServiceProviderManager.getRuleServiceProvider("http://drools.org/");
+        
+        final RuleAdministrator ruleAdministrator = ruleServiceProvider.getRuleAdministrator();
         assertNotNull( "cannot obtain RuleAdministrator",
                        ruleAdministrator );
         assertTrue( "not a class instance",
-                    ruleAdministrator == this.ruleServiceProvider.getRuleAdministrator() );
+                    ruleAdministrator == ruleServiceProvider.getRuleAdministrator() );
     }
 }

[Jboss-svn-commits] JBL Code SVN: r4939 - labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules

[<jbo...@li...>]

Author: mar...@jb...
Date: 2006-07-06 22:28:30 -0400 (Thu, 06 Jul 2006)
New Revision: 4939

Modified:
   labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/RuleRuntimeImpl.java
Log:
-minor improvements to jsr94

Modified: labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/RuleRuntimeImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/RuleRuntimeImpl.java	2006-07-07 02:21:35 UTC (rev 4938)
+++ labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/RuleRuntimeImpl.java	2006-07-07 02:28:30 UTC (rev 4939)
@@ -91,9 +91,7 @@
                                                                                    properties,
                                                                                    this.repository );
             return session;
-        }
-
-        if ( ruleSessionType == RuleRuntime.STATEFUL_SESSION_TYPE ) {
+        } else if ( ruleSessionType == RuleRuntime.STATEFUL_SESSION_TYPE ) {
             final StatefulRuleSessionImpl session = new StatefulRuleSessionImpl( uri,
                                                                                  properties,
                                                                                  this.repository );

[Jboss-svn-commits] JBL Code SVN: r4938 - labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/admin

[<jbo...@li...>]

Author: mar...@jb...
Date: 2006-07-06 22:21:35 -0400 (Thu, 06 Jul 2006)
New Revision: 4938

Modified:
   labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/admin/LocalRuleExecutionSetProviderImpl.java
Log:
JBRULES-361 Allow DSL to be specify as a String and Reader value

Modified: labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/admin/LocalRuleExecutionSetProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/admin/LocalRuleExecutionSetProviderImpl.java	2006-07-07 01:38:10 UTC (rev 4937)
+++ labs/jbossrules/trunk/drools-jsr94/src/main/java/org/drools/jsr94/rules/admin/LocalRuleExecutionSetProviderImpl.java	2006-07-07 02:21:35 UTC (rev 4938)
@@ -100,11 +100,11 @@
                                                    final Map properties) throws RuleExecutionSetCreateException {
         try {
             final PackageBuilder builder = new PackageBuilder();
-            String dsl = null;
+            Object dsl = null;
             String source = null;
             
             if ( properties != null ) {
-                dsl = ( String ) properties.get( "dsl" );
+                dsl = properties.get( "dsl" );
                 source = ( String ) properties.get( "source" );
             }
             
@@ -124,8 +124,13 @@
                     // xml cannot specify a dsl
                     builder.addPackageFromXml( ruleExecutionSetReader );
                 } else {
-                    builder.addPackageFromDrl( ruleExecutionSetReader,
-                                               new StringReader( dsl ) );
+                    if  ( dsl instanceof Reader ) {
+                        builder.addPackageFromDrl( ruleExecutionSetReader,
+                                                   (Reader) dsl );                        
+                    } else {
+                        builder.addPackageFromDrl( ruleExecutionSetReader,
+                                                   new StringReader( (String) dsl ) );
+                    }
                 }               
             }
             

[Jboss-svn-commits] JBL Code SVN: r4936 - labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/msglistener

[<jbo...@li...>]

Author: estebanschifman
Date: 2006-07-06 19:33:22 -0400 (Thu, 06 Jul 2006)
New Revision: 4936

Modified:
   labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
Log:
Adjust to changes in ParamsRepository class

Modified: labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java	2006-07-06 23:31:25 UTC (rev 4935)
+++ labs/jbossesb/trunk/ESBCore/services/src/org/jboss/soa/esb/services/msglistener/AbstractEsbMsgDrivenBean.java	2006-07-06 23:33:22 UTC (rev 4936)
@@ -244,7 +244,7 @@
 	  	= EsbSysProps.getParamsReposFactoryClass(); 
 	  ParamsRepository oRep 
 	  	= ParamsReposUtil.reposFromFactory(sFactoryClass,null);
-	  return oRep.getElement(ParamsReposUtil.nameFromString(p_sKey));
+	  return oRep.getElement(oRep.nameFromString(p_sKey));
 
   } //__________________________________
 

[Jboss-svn-commits] JBL Code SVN: r4935 - labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests

[<jbo...@li...>]

Author: estebanschifman
Date: 2006-07-06 19:31:25 -0400 (Thu, 06 Jul 2006)
New Revision: 4935

Modified:
   labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java
Log:
Adjust to changes in ParamsRepository class

Modified: labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java	2006-07-06 23:30:41 UTC (rev 4934)
+++ labs/jbossesb/trunk/ESBCore/Tests/src/org/jboss/soa/esb/tests/TestParamsRepository.java	2006-07-06 23:31:25 UTC (rev 4935)
@@ -39,12 +39,12 @@
 	private void performTest() throws Exception
 	{
 		String sDir = "/tmp/jbossEsb/paramsDir";
-		Name oInpName = ParamsReposUtil.nameFromString(sDir)
+		Name oInpName = m_oRepos.nameFromString(sDir)
 			.add("FileMoverConfigExample.xml");
 
 		DomElement oElem = m_oRepos.getElement(oInpName);
 
-		Name oOutName = ParamsReposUtil.nameFromString(sDir)
+		Name oOutName = m_oRepos.nameFromString(sDir)
 			.add("outputTest.xml");
 		m_oRepos.storeElement(oOutName,oElem);
 

[Jboss-svn-commits] JBL Code SVN: r4934 - labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners

[<jbo...@li...>]

Author: estebanschifman
Date: 2006-07-06 19:30:41 -0400 (Thu, 06 Jul 2006)
New Revision: 4934

Modified:
   labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
   labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
Log:
Adjust to changes in ParamsRepository class

Modified: labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java	2006-07-06 23:29:27 UTC (rev 4933)
+++ labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/AbstractPoller.java	2006-07-06 23:30:41 UTC (rev 4934)
@@ -82,7 +82,7 @@
 
     String sFactoryClass = EsbSysProps.getParamsReposFactoryClass();
     m_oParmRepos = ParamsReposUtil.reposFromFactory(sFactoryClass,null);
-    m_oParmsName = ParamsReposUtil.nameFromString(p_sParamsUid);
+    m_oParmsName = m_oParmRepos.nameFromString(p_sParamsUid);
   } //__________________________________
   
   protected void runUntilEndRequested() throws Exception

Modified: labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java	2006-07-06 23:29:27 UTC (rev 4933)
+++ labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/OldDirListener.java	2006-07-06 23:30:41 UTC (rev 4934)
@@ -99,7 +99,7 @@
     String sFactoryClass = EsbSysProps.getParamsReposFactoryClass();
     m_oParmRepos = ParamsReposUtil.reposFromFactory(sFactoryClass,null);
 
-    Name oParms = ParamsReposUtil.nameFromString(p_sParamsUid);
+    Name oParms = m_oParmRepos.nameFromString(p_sParamsUid);
     while (loadParmsCycle(oParms))
     {
     }

[Jboss-svn-commits] JBL Code SVN: r4933 - labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters

[<jbo...@li...>]

Author: estebanschifman
Date: 2006-07-06 19:29:27 -0400 (Thu, 06 Jul 2006)
New Revision: 4933

Modified:
   labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/DefaultReposFactory.java
   labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java
   labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsRepository.java
Log:
Move method nameFromString() from ParamsReposUtil, to ParamsRepository interface and provide default implementation

Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/DefaultReposFactory.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/DefaultReposFactory.java	2006-07-06 21:27:55 UTC (rev 4932)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/DefaultReposFactory.java	2006-07-06 23:29:27 UTC (rev 4933)
@@ -22,6 +22,10 @@
 package org.jboss.soa.esb.parameters;
 
 import java.io.*;
+import java.util.Properties;
+
+import javax.naming.CompoundName;
+import javax.naming.InvalidNameException;
 import javax.naming.Name;
 
 import org.jboss.soa.esb.helpers.DomElement;
@@ -116,5 +120,15 @@
 			oF.delete();
 		} //____________________________
 
+		private static final Properties s_oSyntax = new Properties();
+		static
+		{	s_oSyntax.setProperty("jndi.syntax.direction","left_to_right");
+			s_oSyntax.setProperty("jndi.syntax.separator","/");
+		};
+
+		public Name nameFromString(String p_s)
+			throws InvalidNameException
+		{	return new CompoundName(p_s,s_oSyntax);
+		} //________________________________
 	} //____________________________________________________
 } //____________________________________________________________________________

Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java	2006-07-06 21:27:55 UTC (rev 4932)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsReposUtil.java	2006-07-06 23:29:27 UTC (rev 4933)
@@ -24,8 +24,6 @@
 package org.jboss.soa.esb.parameters;
 
 import java.lang.reflect.*;
-import java.util.Properties;
-import javax.naming.*;
 
 import org.jboss.soa.esb.common.EsbSysProps;
 
@@ -54,14 +52,4 @@
 		return reposFromFactory(sFactClass,p_oFactoryParam);
 	} //________________________________
 
-	private static final Properties s_oSyntax = new Properties();
-	static
-	{	s_oSyntax.setProperty("jndi.syntax.direction","left_to_right");
-		s_oSyntax.setProperty("jndi.syntax.separator","/");
-	};
-
-	public static Name nameFromString(String p_s)
-		throws InvalidNameException
-	{	return new CompoundName(p_s,s_oSyntax);
-	} //________________________________
 } //____________________________________________________________________________

Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsRepository.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsRepository.java	2006-07-06 21:27:55 UTC (rev 4932)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/parameters/ParamsRepository.java	2006-07-06 23:29:27 UTC (rev 4933)
@@ -28,6 +28,7 @@
 
 public interface ParamsRepository
 {
+	public Name		  nameFromString (String p_s)			throws Exception;
 	public DomElement storeElement
 				(Name pName, DomElement p_oNew)				throws Exception;
 	public DomElement getElement	(Name pName)			throws Exception;

[Jboss-svn-commits] List Change Announcement: List server move.

[JBoss IT <pos...@li...>]

JBoss List Members,

On July 10th, 2006, our new list server, lists.jboss.org, will  
officially go live. All development lists, including jboss-svn- 
co...@li... will officially be moved to the new  
server, at this time. The new list address will be jboss-svn- 
co...@li....

Everyone currently subscribed to the SourceForge list will be sent a  
subscription invitation to the corresponding new list on our server  
by July 7th, 2006. Access to the old lists on SourceForge will be cut  
off on July 12th, 2006, though archives will remain available on the  
SourceForge list server for the time being, and a link will be  
provided from our new list server (lists.jboss.org).

Thanks for your patience during this transition.

Sincerely,

JBoss IT
pos...@li...

[Jboss-svn-commits] JBL Code SVN: r4932 - labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners

[<jbo...@li...>]

Author: estebanschifman
Date: 2006-07-06 17:27:55 -0400 (Thu, 06 Jul 2006)
New Revision: 4932

Added:
   labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/ZZderivedSqlTablePoller.java
Log:
Simple example of how to extend SqlTablePoller class

Added: labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/ZZderivedSqlTablePoller.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/ZZderivedSqlTablePoller.java	2006-07-06 21:24:01 UTC (rev 4931)
+++ labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/ZZderivedSqlTablePoller.java	2006-07-06 21:27:55 UTC (rev 4932)
@@ -0,0 +1,54 @@
+package org.jboss.soa.esb.listeners;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import org.jboss.soa.esb.util.*;
+import org.jboss.soa.esb.helpers.*;
+
+public class ZZderivedSqlTablePoller extends SqlTablePoller
+{
+	  public static void main(String[] args) throws Exception
+	  	{	new ZZderivedSqlTablePoller(args[0]); }
+
+	  public ZZderivedSqlTablePoller(String pParamsUid) throws Exception
+	  {	super(pParamsUid);
+	  } //________________________________
+	  
+	  protected SqlChildProcess getSqlChildProcess
+  			(SqlPollerChildGroup pDad, DomElement p_oParms) throws Exception
+  	  {
+  		return new ZZChildProcess(pDad, p_oParms);
+  	  } //________________________________
+	  
+	  private static final SimpleDateFormat s_oFmt 
+	  		= new SimpleDateFormat("yyyy/MM/dd HH:mm:ss.mmm");
+
+	  protected class ZZChildProcess extends SqlChildProcess
+	  { 
+		  public ZZChildProcess(SqlPollerChildGroup p_oGrp, DomElement p_oP)
+	  		throws Exception
+	  		{	super(p_oGrp,p_oP); }
+		  
+		  protected String getMsgPfx()
+		  {	return EsbUtil.classSuffix(ZZderivedSqlTablePoller.class)
+			  +" "+s_oFmt.format(new Date(System.currentTimeMillis()))+" ";
+		  }
+
+		  // object m_oInstP contains parameters unique to this instance
+		  // object m_oParent.m_oChParms contains parameters common to all child threads
+		  // of the parent child group
+		  protected String getOkNotifContent()
+		  {
+			  return getMsgPfx()+" OK "+m_oInstP.toString();
+		  }
+		  
+		  protected String getErrorNotifContent()
+		  {		
+			  return getMsgPfx()+" eeeeerrrrrrrrr "+m_oInstP.toString();  
+		  }
+
+	  } //__________________________________________________
+
+	  
+} //____________________________________________________________________________

[Jboss-svn-commits] JBL Code SVN: r4931 - labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners

[<jbo...@li...>]

Author: estebanschifman
Date: 2006-07-06 17:24:01 -0400 (Thu, 06 Jul 2006)
New Revision: 4931

Modified:
   labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
Log:
move getSqlChildProcess() to outermost class (easier override)


Modified: labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java	2006-07-06 21:21:49 UTC (rev 4930)
+++ labs/jbossesb/trunk/ESBCore/listeners/src/org/jboss/soa/esb/listeners/SqlTablePoller.java	2006-07-06 21:24:01 UTC (rev 4931)
@@ -195,18 +195,31 @@
 	runUntilEndRequested();
   } //__________________________________
 
+  /**
+   * Override this method if you wish to extend the SqlChildProcess class
+   * (for example with ad-hoc notifications for OK list or Error list)
+   * @param p_oParms = DomElement containing attributes of trigger
+   * @return  the SqlChildProcess to be started
+   * @throws Exception
+   */
+  	protected SqlChildProcess getSqlChildProcess
+  		(SqlPollerChildGroup pDad, DomElement p_oParms) throws Exception
+  	{
+  		return new SqlChildProcess(pDad, p_oParms);
+  	} //________________________________
+
   @Override
   protected GroupOfChilds newChildGroup(ThreadGroup pThG) throws Exception
   {
   	return new SqlPollerChildGroup(pThG);
   } //__________________________________
   
-  private class SqlPollerChildGroup extends AbstractPoller.GroupOfChilds
+  protected class SqlPollerChildGroup extends AbstractPoller.GroupOfChilds
   {
 	JdbcCleanConn		m_oConn;
 	String[]			m_saKeys;
 	  
-    private SqlPollerChildGroup(ThreadGroup p_oThrGrp) throws Exception
+    protected SqlPollerChildGroup(ThreadGroup p_oThrGrp) throws Exception
     {	super(p_oThrGrp);    	
     } //________________________________
 
@@ -262,19 +275,6 @@
 
     } //________________________________
 	
-/**
- * Override this method if you wish to extend the SqlChildProcess class
- * (for example with ad-hoc notifications for OK list or Error list)
- * @param p_oParms = DomElement containing attributes of trigger
- * @return  the SqlChildProcess to be started
- * @throws Exception
- */
-	protected SqlChildProcess getSqlChildProcess(DomElement p_oParms)
-		throws Exception
-	{
-		return new SqlChildProcess(this, p_oParms);
-	} //________________________________
-
 	@Override
 	protected void doYourJob(DomElement p_oP) throws Exception
 	{
@@ -287,7 +287,7 @@
 	          break;
 	        }
 
-			SqlChildProcess oNew = getSqlChildProcess(oCurr);
+			SqlChildProcess oNew = getSqlChildProcess(this,oCurr);
 	        new Thread(m_oThrGrp,oNew).start();
 	        // Wait a little bit, so thread count will be updated
 	        // at some point in the past, this sleep was indispensable

[Jboss-svn-commits] JBL Code SVN: r4930 - labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers

[<jbo...@li...>]

Author: estebanschifman
Date: 2006-07-06 17:21:49 -0400 (Thu, 06 Jul 2006)
New Revision: 4930

Modified:
   labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/KeyValuePair.java
Log:
new Sring dump() method to make it easy to see key and value

Modified: labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/KeyValuePair.java
===================================================================
--- labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/KeyValuePair.java	2006-07-06 15:16:26 UTC (rev 4929)
+++ labs/jbossesb/trunk/ESBCore/common/src/org/jboss/soa/esb/helpers/KeyValuePair.java	2006-07-06 21:21:49 UTC (rev 4930)
@@ -39,4 +39,7 @@
 		{String sRet = mVal;	mVal = arg0.toString(); return sRet; }
 	public String toString()
 		{ return mVal; }
+	public String dump()
+	{ return "KVpair["+mKey+"="+mVal+"]"; }
+
 } //____________________________________________________________________________

[Jboss-svn-commits] JBoss Common SVN: r75 - in portlets/2_4/src: . HelloWorldPortal HelloWorldPortal/lib HelloWorldPortal/src HelloWorldPortal/src/main HelloWorldPortal/src/main/org HelloWorldPortal/src/main/org/jboss HelloWorldPortal/src/main/org/jboss/portlet HelloWorldPortal/src/main/org/jboss/portlet/hello HelloWorldPortal/src/resources HelloWorldPortal/src/resources/helloworldportal-war HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/lib

[<jbo...@li...>]

Author: roy...@jb...
Date: 2006-07-06 12:35:37 -0400 (Thu, 06 Jul 2006)
New Revision: 75

Added:
   portlets/2_4/src/HelloWorldPortal/
   portlets/2_4/src/HelloWorldPortal/README.txt
   portlets/2_4/src/HelloWorldPortal/build.xml
   portlets/2_4/src/HelloWorldPortal/helloworldportal.war
   portlets/2_4/src/HelloWorldPortal/lib/
   portlets/2_4/src/HelloWorldPortal/lib/explode.jar
   portlets/2_4/src/HelloWorldPortal/lib/portal-common-lib.jar
   portlets/2_4/src/HelloWorldPortal/lib/portlet-api-lib.jar
   portlets/2_4/src/HelloWorldPortal/src/
   portlets/2_4/src/HelloWorldPortal/src/main/
   portlets/2_4/src/HelloWorldPortal/src/main/org/
   portlets/2_4/src/HelloWorldPortal/src/main/org/jboss/
   portlets/2_4/src/HelloWorldPortal/src/main/org/jboss/portlet/
   portlets/2_4/src/HelloWorldPortal/src/main/org/jboss/portlet/hello/
   portlets/2_4/src/HelloWorldPortal/src/main/org/jboss/portlet/hello/MyPortlet.java
   portlets/2_4/src/HelloWorldPortal/src/resources/
   portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/
   portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/
   portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/helloworld-object.xml
   portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/lib/
   portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/lib/helloworldportal-lib.jar
   portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/portlet-instances.xml
   portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/portlet.xml
   portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/web.xml
Log:
JBPORTAL-934


Property changes on: portlets/2_4/src/HelloWorldPortal
___________________________________________________________________
Name: svn:ignore
   + HelloWorldPortal.iml
*.ipr
*.iws
output


Added: portlets/2_4/src/HelloWorldPortal/README.txt
===================================================================
--- portlets/2_4/src/HelloWorldPortal/README.txt	2006-07-06 16:33:41 UTC (rev 74)
+++ portlets/2_4/src/HelloWorldPortal/README.txt	2006-07-06 16:35:37 UTC (rev 75)
@@ -0,0 +1,8 @@
+The included descriptor will create two pages under a new portal instance.
+
+1. Deploy the helloworldportlet.war (you may hot-deploy it.)
+2. You can access the new pages, by nagivating to:
+   - default page: http://localhost:8080/portal/portal/HelloPortal
+   - foobar page: http://localhost:8080/portal/portal/HelloPortal/foobar
+
+Additionally, you should be able to see this new portal and its pages in the management portlet ui.

Added: portlets/2_4/src/HelloWorldPortal/build.xml
===================================================================
--- portlets/2_4/src/HelloWorldPortal/build.xml	2006-07-06 16:33:41 UTC (rev 74)
+++ portlets/2_4/src/HelloWorldPortal/build.xml	2006-07-06 16:35:37 UTC (rev 75)
@@ -0,0 +1,86 @@
+<project name="JBoss HelloWorld Portal"
+         default="deploy"
+         basedir=".">
+
+   <property name="app.name" value="helloworldportal"/>
+
+   <property name="src.dir" value="${basedir}/src"/>
+
+   <property name="lib.dir" value="${basedir}/lib"/>
+
+   <property name="build.dir" value="${basedir}/output"/>
+
+   <property name="build.lib" value="${build.dir}/lib"/>
+
+   <property name="build.resources" value="${src.dir}/resources"/>
+
+   <property name="build.etc" value="${src.dir}/etc"/>
+
+   <property name="classes.dir" value="${build.dir}/classes"/>
+
+   <property name="dist.dir" value="${src.dir}/resources"/>
+
+   <property name="libs.api" value="${lib.dir}/portlet-api-lib.jar"/>
+
+   <property name="libs.ant"
+             value="${lib.dir}/explode.jar;${lib.dir}/portal-common-lib.jar"/>
+
+   <property name="libs" value="${libs.api};${libs.ant}"/>
+
+   <available property="clover.available" classname="org.apache.tools.ant.taskdefs.CloverCompilerAdapter"/>
+
+   <target name="clover-yes" depends="prepare" if="clover.available">
+      <property name="compiler" value="org.apache.tools.ant.taskdefs.CloverCompilerAdapter"/>
+   </target>
+
+   <target name="clover-no" depends="prepare" unless="clover.available">
+      <property name="compiler" value="modern"/>
+   </target>
+
+   <target name="prepare">
+      <mkdir dir="${classes.dir}"/>
+      <mkdir dir="${build.lib}"/>
+      <mkdir dir="${build.lib}/exploded"/>
+   </target>
+
+   <target name="clean">
+      <delete dir="${build.dir}"/>
+   </target>
+
+   <target name="deploy" depends="clover-yes, clover-no">
+      <javac srcdir="${src.dir}"
+             destdir="${classes.dir}"
+             classpath="${libs}"
+             debug="off"
+             optimize="on"
+             deprecation="on"
+             compiler="${compiler}">
+         <include name="main/org/jboss/portlet/**/*.java"/>
+      </javac>
+
+      <!-- helloworldportal-lib.jar -->
+      <jar jarfile="${build.lib}/helloworldportal-lib.jar">
+         <fileset dir="${classes.dir}"/>
+      </jar>
+
+      <mkdir dir="${build.resources}/helloworldportal-war/WEB-INF/lib"/>
+      <copy file="${build.lib}/helloworldportal-lib.jar" todir="${build.resources}/helloworldportal-war/WEB-INF/lib"/>
+
+      <!-- helloworldportal.war -->
+      <jar jarfile="helloworldportal.war">
+         <fileset dir="${build.resources}/helloworldportal-war"/>
+      </jar>
+   </target>
+
+   <target name="explode" depends="deploy">
+      <taskdef classname="org.jboss.portal.common.ant.Explode"
+               name="explode"
+               classpath="${libs}"/>
+      <explode
+            file="helloworldportal.war"
+            todir="${build.lib}/exploded"
+            name="helloworldportal.war"/>
+   </target>
+   <target name="all" depends="deploy"/>
+</project>
+

Added: portlets/2_4/src/HelloWorldPortal/helloworldportal.war
===================================================================
(Binary files differ)


Property changes on: portlets/2_4/src/HelloWorldPortal/helloworldportal.war
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/2_4/src/HelloWorldPortal/lib/explode.jar
===================================================================
(Binary files differ)


Property changes on: portlets/2_4/src/HelloWorldPortal/lib/explode.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/2_4/src/HelloWorldPortal/lib/portal-common-lib.jar
===================================================================
(Binary files differ)


Property changes on: portlets/2_4/src/HelloWorldPortal/lib/portal-common-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/2_4/src/HelloWorldPortal/lib/portlet-api-lib.jar
===================================================================
(Binary files differ)


Property changes on: portlets/2_4/src/HelloWorldPortal/lib/portlet-api-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/2_4/src/HelloWorldPortal/src/main/org/jboss/portlet/hello/MyPortlet.java
===================================================================
--- portlets/2_4/src/HelloWorldPortal/src/main/org/jboss/portlet/hello/MyPortlet.java	2006-07-06 16:33:41 UTC (rev 74)
+++ portlets/2_4/src/HelloWorldPortal/src/main/org/jboss/portlet/hello/MyPortlet.java	2006-07-06 16:35:37 UTC (rev 75)
@@ -0,0 +1,33 @@
+/*****************************************
+ *                                       *
+ *  JBoss Portal: The OpenSource Portal  *
+ *                                       *
+ *   Distributable under LGPL license.   *
+ *   See terms of license at gnu.org.    *
+ *                                       *
+ *****************************************/
+
+package org.jboss.portlet.hello;
+
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.UnavailableException;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+public class MyPortlet extends GenericPortlet
+{
+   public void init()
+   {
+   }
+
+   protected void doView(RenderRequest rRequest, RenderResponse rResponse) throws PortletException, IOException, UnavailableException
+   {
+      rResponse.setContentType("text/html");
+      PrintWriter writer = rResponse.getWriter();
+      writer.write("Hello World!");
+      writer.close();
+   }
+}
\ No newline at end of file

Added: portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/helloworld-object.xml
===================================================================
--- portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/helloworld-object.xml	2006-07-06 16:33:41 UTC (rev 74)
+++ portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/helloworld-object.xml	2006-07-06 16:35:37 UTC (rev 75)
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployments>
+   <deployment>
+      <parent-ref/>
+      <if-exists>overwrite</if-exists>
+      <portal>
+         <portal-name>HelloPortal</portal-name>
+         <properties>
+            <!-- Set the layout for the default portal -->
+            <!-- see also portal-layouts.xml -->
+            <property>
+               <name>layout.id</name>
+               <value>generic</value>
+            </property>
+            <!-- Set the theme for the default portal -->
+            <!-- see also portal-themes.xml -->
+            <property>
+               <name>theme.id</name>
+               <value>Nphalanx</value>
+            </property>
+            <!-- set the default render set name (used by the render tag in layouts) -->
+            <!-- see also portal-renderSet.xml -->
+            <property>
+               <name>theme.renderSetId</name>
+               <value>divRenderer</value>
+            </property>
+            <!-- set the default strategy name (used by the strategy interceptor) -->
+            <!-- see also portal-strategies.xml -->
+            <property>
+               <name>layout.strategyId</name>
+               <value>maximizedRegion</value>
+            </property>
+         </properties>
+         <supported-modes>
+            <mode>view</mode>
+            <mode>edit</mode>
+            <mode>help</mode>
+         </supported-modes>
+         <supported-window-states>
+            <window-state>normal</window-state>
+            <window-state>minimized</window-state>
+            <window-state>maximized</window-state>
+         </supported-window-states>
+         <page>
+            <page-name>default</page-name>
+            <properties/>
+            <window>
+               <window-name>MyPortletWindow</window-name>
+               <instance-ref>MyPortletInstance</instance-ref>
+               <region>center</region>
+               <height>0</height>
+            </window>
+            <security-constraint>
+               <policy-permission>
+                  <unchecked/>
+                  <action-name>viewrecursive</action-name>
+               </policy-permission>
+            </security-constraint>
+         </page>
+         <security-constraint>
+            <policy-permission>
+               <unchecked/>
+               <action-name>personalizerecursive</action-name>
+            </policy-permission>
+         </security-constraint>
+      </portal>
+   </deployment>
+   <deployment>
+      <if-exists>overwrite</if-exists>
+      <parent-ref>HelloPortal</parent-ref>
+      <page>
+         <page-name>foobar</page-name>
+         <window>
+            <window-name>MyPortletWindow</window-name>
+            <instance-ref>MyPortletInstance</instance-ref>
+            <region>center</region>
+            <height>0</height>
+         </window>
+         <security-constraint>
+            <policy-permission>
+               <unchecked/>
+               <action-name>viewrecursive</action-name>
+            </policy-permission>
+         </security-constraint>
+      </page>
+   </deployment>
+</deployments>
\ No newline at end of file

Added: portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/lib/helloworldportal-lib.jar
===================================================================
(Binary files differ)


Property changes on: portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/lib/helloworldportal-lib.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/portlet-instances.xml
===================================================================
--- portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/portlet-instances.xml	2006-07-06 16:33:41 UTC (rev 74)
+++ portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/portlet-instances.xml	2006-07-06 16:35:37 UTC (rev 75)
@@ -0,0 +1,10 @@
+<?xml version="1.0" standalone="yes"?>
+<deployments>
+   <deployment>
+      <instance>
+         <instance-id>MyPortletInstance</instance-id>
+         <portlet-ref>MyPortlet</portlet-ref>
+      </instance>
+   </deployment>
+</deployments>
+

Added: portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/portlet.xml
===================================================================
--- portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/portlet.xml	2006-07-06 16:33:41 UTC (rev 74)
+++ portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/portlet.xml	2006-07-06 16:35:37 UTC (rev 75)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd /opt/SUNWps/dtd/portlet.xsd"
+             version="1.0">
+   <portlet>
+      <portlet-name>MyPortlet</portlet-name>
+      <portlet-class>org.jboss.portlet.hello.MyPortlet</portlet-class>
+      <supports>
+         <mime-type>text/html</mime-type>
+         <portlet-mode>VIEW</portlet-mode>
+      </supports>
+      <portlet-info>
+         <title>MyPortlet</title>
+      </portlet-info>
+   </portlet>
+</portlet-app>

Added: portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/web.xml
===================================================================
--- portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/web.xml	2006-07-06 16:33:41 UTC (rev 74)
+++ portlets/2_4/src/HelloWorldPortal/src/resources/helloworldportal-war/WEB-INF/web.xml	2006-07-06 16:35:37 UTC (rev 75)
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+   "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+   "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+</web-app>

[Jboss-svn-commits] JBoss Common SVN: r74 - portlets

[<jbo...@li...>]

Author: roy...@jb...
Date: 2006-07-06 12:33:41 -0400 (Thu, 06 Jul 2006)
New Revision: 74

Removed:
   portlets/bundles/
Log:
bye