Changeset 4963

Timestamp:

06/27/08 13:34:20 (5 months ago)

Author:

marc.englund@…

Message:

Basic JBossPortal support: WAR deploys on JBossPortal, portlets show up; Fixes #1851

Location:

trunk

Files:

• WebContent/WEB-INF/itmill-object.xml (added)
• WebContent/WEB-INF/portlet-instances.xml (added)
• build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java (modified) (7 diffs)
• src/com/itmill/toolkit/terminal/gwt/server/ApplicationPortlet.java (modified) (2 diffs)

trunk/build/buildhelpers/com/itmill/toolkit/buildhelpers/PortletConfigurationGenerator.java

@@ -32 +32 @@
     private static final String LIFERAY_PORTLET_XML_FILE = "liferay-portlet.xml";
     private static final String LIFERAY_DISPLAY_XML_FILE = "liferay-display.xml";
+    private static final String JBOSS_OBJECT_FILE = "itmill-object.xml";
+    private static final String JBOSS_INSTANCE_FILE = "portlet-instances.xml";
 
     // "templates" follow;
@@ -108 +110 @@
             + "        </category>\n" + "</display>";
 
+    private static final String JBOSS_INSTANCE_HEAD = "<?xml version=\"1.0\" standalone=\"yes\"?>\r\n"
+            + "<!DOCTYPE deployments PUBLIC\r\n"
+            + "   \"-//JBoss Portal//DTD Portlet Instances 2.6//EN\"\r\n"
+            + "   \"http://www.jboss.org/portal/dtd/portlet-instances_2_6.dtd\">\r\n"
+            + "<deployments>\r\n";
+    private static final String JBOSS_INSTANCE_SECTION = "   <deployment>\r\n      <instance>\r\n"
+            + "         <instance-id>%PORTLETNAME%Instance</instance-id>\r\n"
+            + "         <portlet-ref>%PORTLETNAME%</portlet-ref>\r\n"
+            + "      </instance>\r\n   </deployment>\r\n";
+    private static final String JBOSS_INSTANCE_FOOT = "</deployments>";
+    private static final String JBOSS_OBJECT_HEAD = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n"
+            + "<!DOCTYPE deployments PUBLIC\r\n"
+            + "   \"-//JBoss Portal//DTD Portal Object 2.6//EN\"\r\n"
+            + "   \"http://www.jboss.org/portal/dtd/portal-object_2_6.dtd\">\r\n"
+            + "<deployments>\r\n";
+    private static final String JBOSS_OBJECT_SECTION = "   <deployment>\r\n"
+            + "      <parent-ref>default.default</parent-ref>\r\n"
+            + "      <if-exists>overwrite</if-exists>"
+            + "      <window>\r\n"
+            + "         <window-name>%PORTLETNAME%Window</window-name>\r\n"
+            + "         <content>\r\n"
+            + "                <content-type>portlet</content-type>\r\n"
+            + "                <content-uri>%PORTLETNAME%Instance</content-uri>\r\n"
+            + "         </content>\r\n"
+            + "         <region>center</region>\r\n"
+            + "         <height>1</height>\r\n"
+            + "      </window>\r\n   </deployment>\r\n";
+    private static final String JBOSS_OBJECT_FOOT = "</deployments>";
+
     /**
      * @param args
@@ -194 +225 @@
             System.out.println(liferayDisplayXmlFile + " not found!");
         }
-
-        if (pout != null && lpout != null && ldout != null) {
+        // open jboss object.xml
+        File jbossObjectXmlFile = new File(args[0] + File.separatorChar
+                + JBOSS_OBJECT_FILE);
+        OutputStreamWriter joout = null;
+        try {
+            joout = new OutputStreamWriter(new FileOutputStream(
+                    jbossObjectXmlFile), Charset.forName("UTF-8"));
+        } catch (FileNotFoundException e) {
+            System.out.println(jbossObjectXmlFile + " not found!");
+        }
+        // open jboss insrance.xml
+        File jbossInstanceXmlFile = new File(args[0] + File.separatorChar
+                + JBOSS_INSTANCE_FILE);
+        OutputStreamWriter jiout = null;
+        try {
+            jiout = new OutputStreamWriter(new FileOutputStream(
+                    jbossInstanceXmlFile), Charset.forName("UTF-8"));
+        } catch (FileNotFoundException e) {
+            System.out.println(jbossInstanceXmlFile + " not found!");
+        }
+
+        if (pout != null && lpout != null && ldout != null && joout != null
+                && jiout != null) {
 
             String pstring = PORTLET_XML_HEAD;
             String lpstring = LIFERAY_PORTLET_XML_HEAD;
             String ldstring = LIFERAY_DISPLAY_XML_HEAD;
+            String jostring = JBOSS_OBJECT_HEAD;
+            String jistring = JBOSS_INSTANCE_HEAD;
 
             Pattern p1 = Pattern
@@ -265 +319 @@
                 ldstring += s;
 
+                s = JBOSS_OBJECT_SECTION;
+                s = s.replaceAll("%NAME%", name);
+                s = s.replaceAll("%PORTLETNAME%", pname);
+                s = s.replaceAll("%URL%", url);
+                jostring += s;
+
+                s = JBOSS_INSTANCE_SECTION;
+                s = s.replaceAll("%NAME%", name);
+                s = s.replaceAll("%PORTLETNAME%", pname);
+                s = s.replaceAll("%URL%", url);
+                jistring += s;
+
             }
 
@@ -270 +336 @@
             lpstring += LIFERAY_PORTLET_XML_FOOT;
             ldstring += LIFERAY_DISPLAY_XML_FOOT;
+            jostring += JBOSS_OBJECT_FOOT;
+            jistring += JBOSS_INSTANCE_FOOT;
 
             try {
@@ -275 +343 @@
                 lpout.write(lpstring);
                 ldout.write(ldstring);
+                joout.write(jostring);
+                jiout.write(jistring);
             } catch (IOException e) {
                 System.out.println("Write FAILED:" + e);
@@ -290 +360 @@
             if (ldout != null) {
                 ldout.close();
+            }
+            if (joout != null) {
+                joout.close();
+            }
+            if (jiout != null) {
+                jiout.close();
             }
         } catch (IOException e) {

trunk/src/com/itmill/toolkit/terminal/gwt/server/ApplicationPortlet.java

@@ -51 +51 @@
             RenderResponse response) throws IOException {
 
+        response.setContentType("text/html");
         if (app != null) {
             PortletSession sess = request.getPortletSession();
@@ -73 +74 @@
 
             } catch (PortletException e) {
-                response.setContentType("text/html");
                 PrintWriter out = response.getWriter();
                 out.print("<h1>Servlet include failed!</h1>");