JBoss Portal SVN: r12183 - tags/JBoss_Portal_2_7_0/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 09:52:34 -0400 (Mon, 27 Oct 2008)
New Revision: 12183
Modified:
tags/JBoss_Portal_2_7_0/build/distrib.xml
Log:
oups
Modified: tags/JBoss_Portal_2_7_0/build/distrib.xml
===================================================================
--- tags/JBoss_Portal_2_7_0/build/distrib.xml 2008-10-27 12:30:01 UTC (rev 12182)
+++ tags/JBoss_Portal_2_7_0/build/distrib.xml 2008-10-27 13:52:34 UTC (rev 12183)
@@ -3,7 +3,7 @@
<property name="source.dir" value=".."/>
<property name="docs.dir" value="${source.dir}/../docs"/>
<property name="examples.dir" value="${source.dir}/../examples"/>
- <property name="release.version" value="2.7.0i.GA"/>
+ <property name="release.version" value="2.7.0.GA"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
15 years, 8 months
JBoss Portal SVN: r12182 - in tags/JBoss_Portal_2_7_0: server/src/main/org/jboss/portal/server and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 08:30:01 -0400 (Mon, 27 Oct 2008)
New Revision: 12182
Modified:
tags/JBoss_Portal_2_7_0/build/distrib.xml
tags/JBoss_Portal_2_7_0/server/src/main/org/jboss/portal/server/PortalConstants.java
Log:
Changing version number
Modified: tags/JBoss_Portal_2_7_0/build/distrib.xml
===================================================================
--- tags/JBoss_Portal_2_7_0/build/distrib.xml 2008-10-27 11:43:20 UTC (rev 12181)
+++ tags/JBoss_Portal_2_7_0/build/distrib.xml 2008-10-27 12:30:01 UTC (rev 12182)
@@ -3,7 +3,7 @@
<property name="source.dir" value=".."/>
<property name="docs.dir" value="${source.dir}/../docs"/>
<property name="examples.dir" value="${source.dir}/../examples"/>
- <property name="release.version" value="2.7.0.B1"/>
+ <property name="release.version" value="2.7.0i.GA"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
@@ -446,4 +446,4 @@
<!-- Build and compress everything -->
<target name="main" depends="licenses,build,package,zip" description="do everything - build source, doc, distro"/>
-</project>
\ No newline at end of file
+</project>
Modified: tags/JBoss_Portal_2_7_0/server/src/main/org/jboss/portal/server/PortalConstants.java
===================================================================
--- tags/JBoss_Portal_2_7_0/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-10-27 11:43:20 UTC (rev 12181)
+++ tags/JBoss_Portal_2_7_0/server/src/main/org/jboss/portal/server/PortalConstants.java 2008-10-27 12:30:01 UTC (rev 12182)
@@ -36,7 +36,7 @@
{
/** Current version. */
- public static final Version VERSION = new Version("JBoss Portal", 2, 7, 0, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Community");
+ public static final Version VERSION = new Version("JBoss Portal", 2, 7, 0, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Community");
/** The default portal name. */
public static final String DEFAULT_PORTAL_NAME = "default";
15 years, 8 months
JBoss Portal SVN: r12181 - tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 07:43:20 -0400 (Mon, 27 Oct 2008)
New Revision: 12181
Added:
tags/JBoss_Portal_2_7_0/
Log:
tagging JBoss Portal 2.7.0.GA
Copied: tags/JBoss_Portal_2_7_0 (from rev 12180, branches/JBoss_Portal_Branch_2_7)
15 years, 8 months
JBoss Portal SVN: r12180 - in branches/JBoss_Portal_Branch_2_6: cms/src/main/org/jboss/portal/cms/impl/jcr and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 07:05:55 -0400 (Mon, 27 Oct 2008)
New Revision: 12180
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CommandFactory.java
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
Log:
JBPORTAL-2210: Wysiwyg editor is not showing images correctly
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CommandFactory.java 2008-10-27 10:54:00 UTC (rev 12179)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CommandFactory.java 2008-10-27 11:05:55 UTC (rev 12180)
@@ -25,10 +25,8 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.cms.CMS;
import org.jboss.portal.search.impl.jcr.JCRQuery;
-import java.io.InputStream;
import java.util.List;
import java.util.Locale;
@@ -74,9 +72,9 @@
Command createContentCreateNewVersionCommand(List contents, boolean bMakeLive);
- Command createStoreArchiveCommand(String sRootPath, InputStream is, String sLanguage);
+ Command createStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage);
- Command createAsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage);
+ Command createAsyncStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage);
Command createItemExistsCommand(String sPath);
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2008-10-27 10:54:00 UTC (rev 12179)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2008-10-27 11:05:55 UTC (rev 12180)
@@ -51,12 +51,10 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.cms.CMS;
import org.jboss.portal.search.impl.jcr.JCRQuery;
import org.jboss.portal.cms.impl.jcr.command.AsyncStoreArchiveCommand;
-import java.io.InputStream;
import java.io.OutputStream;
import java.util.List;
import java.util.Locale;
@@ -156,14 +154,14 @@
return new ContentCreateNewVersionCommand(contents, bMakeLive);
}
- public Command createStoreArchiveCommand(String sRootPath, InputStream is, String sLanguage)
+ public Command createStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
- return new StoreArchiveCommand(sRootPath, is, sLanguage);
+ return new StoreArchiveCommand(sRootPath, archiveBytes, sLanguage);
}
- public Command createAsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage)
+ public Command createAsyncStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
- return new AsyncStoreArchiveCommand(cms,sRootPath, is, sLanguage);
+ return new AsyncStoreArchiveCommand(sRootPath, archiveBytes, sLanguage);
}
public Command createItemExistsCommand(String sPath)
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java 2008-10-27 10:54:00 UTC (rev 12179)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java 2008-10-27 11:05:55 UTC (rev 12180)
@@ -22,18 +22,20 @@
******************************************************************************/
package org.jboss.portal.cms.impl.jcr.command;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
import org.apache.log4j.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.portal.cms.impl.jcr.JCRCMS;
import org.jboss.portal.cms.impl.jcr.JCRCommand;
import org.jboss.portal.cms.impl.jcr.JCRCommandContext;
+import org.jboss.portal.cms.CMS;
import org.jboss.portal.cms.CMSException;
-import java.io.InputStream;
-
-import org.jboss.portal.cms.CMS;
-
/**
* Saves an uploaded archive to the repo.
*
@@ -47,9 +49,8 @@
private static Logger log = Logger.getLogger(AsyncStoreArchiveCommand.class);
String msRootPath;
- InputStream mIS;
+ byte[] archiveBytes;
String msLanguage;
- CMS cms = null;
private Object user = null;
private Object approvePublishWorkflow = null;
@@ -60,12 +61,11 @@
* @param is
* @param sLanguage
*/
- public AsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage)
+ public AsyncStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
this.msRootPath = sRootPath;
- this.mIS = is;
+ this.archiveBytes = archiveBytes;
this.msLanguage = sLanguage;
- this.cms = cms;
}
/**
@@ -111,7 +111,9 @@
JCRCMS.turnOnWorkflow();
}
- JCRCommand storeArchiveCommand = (JCRCommand)cms.getCommandFactory().createStoreArchiveCommand(msRootPath, mIS, msLanguage);
+ CMS cms = this.findCMSService();
+ JCRCommand storeArchiveCommand = (JCRCommand)cms.getCommandFactory().
+ createStoreArchiveCommand(msRootPath, archiveBytes, msLanguage);
cms.execute(storeArchiveCommand);
log.info("Async Processing finished..................");
@@ -123,5 +125,12 @@
log.error("-----------------------------------------------------------------------------");
}
}
+
+ //Find the CMS Service for the Asynchronous processing
+ private CMS findCMSService() throws Exception
+ {
+ MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+ return (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
+ }
}
}
\ No newline at end of file
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-10-27 10:54:00 UTC (rev 12179)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-10-27 11:05:55 UTC (rev 12180)
@@ -57,7 +57,7 @@
private static Logger log = Logger.getLogger(StoreArchiveCommand.class);
String msRootPath;
- InputStream mIS;
+ byte[] archiveBytes;
String msLanguage;
/**
@@ -65,10 +65,10 @@
* @param is
* @param sLanguage
*/
- public StoreArchiveCommand(String sRootPath, InputStream is, String sLanguage)
+ public StoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
this.msRootPath = sRootPath;
- this.mIS = is;
+ this.archiveBytes = archiveBytes;
this.msLanguage = sLanguage;
}
@@ -271,13 +271,8 @@
FileOutputStream fos = new FileOutputStream(zipFile.getCanonicalPath());
try
{
- int count;
- byte[] data = new byte[1024];
- while ((count = this.mIS.read(data, 0, 1024)) != -1)
- {
- fos.write(data, 0, count);
- fos.flush();
- }
+ fos.write(this.archiveBytes);
+ fos.close();
}
finally
{
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java 2008-10-27 10:54:00 UTC (rev 12179)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/commands/TestFileArchiveUpload.java 2008-10-27 11:05:55 UTC (rev 12180)
@@ -95,7 +95,8 @@
try
{
is = IOTools.safeBufferedWrapper(new FileInputStream(sZipFile));
- Command storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", is, "en");
+ byte[] archiveBytes = IOTools.getBytes(is);
+ Command storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", archiveBytes, "en");
service.execute(storearchiveCMD);
}
finally
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-27 10:54:00 UTC (rev 12179)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-27 11:05:55 UTC (rev 12180)
@@ -1078,9 +1078,9 @@
// check if the current item is a form field or an uploaded file
if (!item.isFormField())
{
- InputStream is = item.getInputStream();
+ byte[] archiveBytes = item.get();
- Command storearchiveCMD = CMSService.getCommandFactory().createAsyncStoreArchiveCommand(CMSService, sPath, is, sLanguage);
+ Command storearchiveCMD = CMSService.getCommandFactory().createAsyncStoreArchiveCommand(sPath, archiveBytes, sLanguage);
CMSService.execute(storearchiveCMD);
List messages = new ArrayList();
15 years, 8 months
JBoss Portal SVN: r12179 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 06:54:00 -0400 (Mon, 27 Oct 2008)
New Revision: 12179
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
Log:
JBPORTAL-2210: Wysiwyg editor is not showing images correctly
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-27 10:53:44 UTC (rev 12178)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/create.jsp 2008-10-27 10:54:00 UTC (rev 12179)
@@ -61,6 +61,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "true",
convert_urls: "false",
+ document_base_url : "<%= sDocBase %>",
extended_valid_elements :
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-10-27 10:53:44 UTC (rev 12178)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/edit.jsp 2008-10-27 10:54:00 UTC (rev 12179)
@@ -40,6 +40,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "true",
convert_urls: "false",
+ document_base_url : "<%= sDocBase %>",
extended_valid_elements :
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-10-27 10:53:44 UTC (rev 12178)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2008-10-27 10:54:00 UTC (rev 12179)
@@ -122,6 +122,7 @@
plugin_insertdate_timeFormat : "%H:%M:%S",
relative_urls : "true",
convert_urls: "false",
+ document_base_url : "<%= sDocBase %>",
extended_valid_elements :
"style[type],a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],font[face|size|color],hr[class|width|size|noshade]"
});
15 years, 8 months
JBoss Portal SVN: r12178 - branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 06:53:44 -0400 (Mon, 27 Oct 2008)
New Revision: 12178
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
Log:
JBPORTAL-2212 - Uploading an archive fails on the slave node
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-27 10:51:07 UTC (rev 12177)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-27 10:53:44 UTC (rev 12178)
@@ -1078,9 +1078,9 @@
// check if the current item is a form field or an uploaded file
if (!item.isFormField())
{
- InputStream is = item.getInputStream();
+ byte[] archiveBytes = item.get();
- Command storearchiveCMD = CMSService.getCommandFactory().createAsyncStoreArchiveCommand(CMSService, sPath, is, sLanguage);
+ Command storearchiveCMD = CMSService.getCommandFactory().createAsyncStoreArchiveCommand(sPath, archiveBytes, sLanguage);
CMSService.execute(storearchiveCMD);
List messages = new ArrayList();
15 years, 8 months
JBoss Portal SVN: r12177 - in modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms: impl/jcr and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 06:51:07 -0400 (Mon, 27 Oct 2008)
New Revision: 12177
Modified:
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CommandFactory.java
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java
modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
Log:
JBPORTAL-2212 - Uploading an archive fails on the slave node
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CommandFactory.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CommandFactory.java 2008-10-27 10:49:57 UTC (rev 12176)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CommandFactory.java 2008-10-27 10:51:07 UTC (rev 12177)
@@ -25,10 +25,8 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.cms.CMS;
import org.jboss.portal.search.impl.jcr.JCRQuery;
-import java.io.InputStream;
import java.util.List;
import java.util.Locale;
@@ -74,9 +72,9 @@
Command createContentCreateNewVersionCommand(List contents, boolean bMakeLive);
- Command createStoreArchiveCommand(String sRootPath, InputStream is, String sLanguage);
+ Command createStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage);
- Command createAsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage);
+ Command createAsyncStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage);
Command createItemExistsCommand(String sPath);
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2008-10-27 10:49:57 UTC (rev 12176)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2008-10-27 10:51:07 UTC (rev 12177)
@@ -51,12 +51,10 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.cms.CMS;
import org.jboss.portal.search.impl.jcr.JCRQuery;
import org.jboss.portal.cms.impl.jcr.command.AsyncStoreArchiveCommand;
-import java.io.InputStream;
import java.util.List;
import java.util.Locale;
@@ -155,14 +153,14 @@
return new ContentCreateNewVersionCommand(contents, bMakeLive);
}
- public Command createStoreArchiveCommand(String sRootPath, InputStream is, String sLanguage)
+ public Command createStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
- return new StoreArchiveCommand(sRootPath, is, sLanguage);
+ return new StoreArchiveCommand(sRootPath, archiveBytes, sLanguage);
}
- public Command createAsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage)
+ public Command createAsyncStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
- return new AsyncStoreArchiveCommand(cms,sRootPath, is, sLanguage);
+ return new AsyncStoreArchiveCommand(sRootPath, archiveBytes, sLanguage);
}
public Command createItemExistsCommand(String sPath)
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java 2008-10-27 10:49:57 UTC (rev 12176)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java 2008-10-27 10:51:07 UTC (rev 12177)
@@ -22,18 +22,20 @@
******************************************************************************/
package org.jboss.portal.cms.impl.jcr.command;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
import org.apache.log4j.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.portal.cms.impl.jcr.JCRCMS;
import org.jboss.portal.cms.impl.jcr.JCRCommand;
import org.jboss.portal.cms.impl.jcr.JCRCommandContext;
+import org.jboss.portal.cms.CMS;
import org.jboss.portal.cms.CMSException;
-import java.io.InputStream;
-
-import org.jboss.portal.cms.CMS;
-
/**
* Saves an uploaded archive to the repo.
*
@@ -47,9 +49,8 @@
private static Logger log = Logger.getLogger(AsyncStoreArchiveCommand.class);
String msRootPath;
- InputStream mIS;
+ byte[] archiveBytes;
String msLanguage;
- CMS cms = null;
private Object user = null;
private Object approvePublishWorkflow = null;
@@ -60,12 +61,11 @@
* @param is
* @param sLanguage
*/
- public AsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage)
+ public AsyncStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
this.msRootPath = sRootPath;
- this.mIS = is;
+ this.archiveBytes = archiveBytes;
this.msLanguage = sLanguage;
- this.cms = cms;
}
/**
@@ -111,7 +111,9 @@
JCRCMS.turnOnWorkflow();
}
- JCRCommand storeArchiveCommand = (JCRCommand)cms.getCommandFactory().createStoreArchiveCommand(msRootPath, mIS, msLanguage);
+ CMS cms = this.findCMSService();
+ JCRCommand storeArchiveCommand = (JCRCommand)cms.getCommandFactory().
+ createStoreArchiveCommand(msRootPath, archiveBytes, msLanguage);
cms.execute(storeArchiveCommand);
log.info("Async Processing finished..................");
@@ -123,5 +125,12 @@
log.error("-----------------------------------------------------------------------------");
}
}
+
+ //Find the CMS Service for the Asynchronous processing
+ private CMS findCMSService() throws Exception
+ {
+ MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+ return (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
+ }
}
}
\ No newline at end of file
Modified: modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-10-27 10:49:57 UTC (rev 12176)
+++ modules/cms/trunk/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-10-27 10:51:07 UTC (rev 12177)
@@ -57,7 +57,7 @@
private static Logger log = Logger.getLogger(StoreArchiveCommand.class);
String msRootPath;
- InputStream mIS;
+ byte[] archiveBytes;
String msLanguage;
/**
@@ -65,10 +65,10 @@
* @param is
* @param sLanguage
*/
- public StoreArchiveCommand(String sRootPath, InputStream is, String sLanguage)
+ public StoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
this.msRootPath = sRootPath;
- this.mIS = is;
+ this.archiveBytes = archiveBytes;
this.msLanguage = sLanguage;
}
@@ -271,13 +271,8 @@
FileOutputStream fos = new FileOutputStream(zipFile.getCanonicalPath());
try
{
- int count;
- byte[] data = new byte[1024];
- while ((count = this.mIS.read(data, 0, 1024)) != -1)
- {
- fos.write(data, 0, count);
- fos.flush();
- }
+ fos.write(this.archiveBytes);
+ fos.close();
}
finally
{
15 years, 8 months
JBoss Portal SVN: r12176 - modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 06:49:57 -0400 (Mon, 27 Oct 2008)
New Revision: 12176
Modified:
modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestFileArchiveUpload.java
Log:
JBPORTAL-2212 - Uploading an archive fails on the slave node
Modified: modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestFileArchiveUpload.java
===================================================================
--- modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestFileArchiveUpload.java 2008-10-27 10:49:32 UTC (rev 12175)
+++ modules/cms/trunk/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestFileArchiveUpload.java 2008-10-27 10:49:57 UTC (rev 12176)
@@ -79,7 +79,8 @@
try
{
is = IOTools.safeBufferedWrapper(Thread.currentThread().getContextClassLoader().getResourceAsStream(this.sZipFile));
- Command storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", is, "en");
+ byte[] archiveBytes = IOTools.getBytes(is);
+ Command storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", archiveBytes, "en");
service.execute(storearchiveCMD);
}
finally
15 years, 8 months
JBoss Portal SVN: r12175 - modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 06:49:32 -0400 (Mon, 27 Oct 2008)
New Revision: 12175
Modified:
modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestFileArchiveUpload.java
Log:
JBPORTAL-2212 - Uploading an archive fails on the slave node
Modified: modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestFileArchiveUpload.java
===================================================================
--- modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestFileArchiveUpload.java 2008-10-27 10:47:05 UTC (rev 12174)
+++ modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/test/java/org/jboss/portal/cms/test/commands/TestFileArchiveUpload.java 2008-10-27 10:49:32 UTC (rev 12175)
@@ -79,7 +79,8 @@
try
{
is = IOTools.safeBufferedWrapper(Thread.currentThread().getContextClassLoader().getResourceAsStream(this.sZipFile));
- Command storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", is, "en");
+ byte[] archiveBytes = IOTools.getBytes(is);
+ Command storearchiveCMD = service.getCommandFactory().createStoreArchiveCommand("", archiveBytes, "en");
service.execute(storearchiveCMD);
}
finally
15 years, 8 months
JBoss Portal SVN: r12174 - in modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms: impl/jcr and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-27 06:47:05 -0400 (Mon, 27 Oct 2008)
New Revision: 12174
Modified:
modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CommandFactory.java
modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java
modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
Log:
JBPORTAL-2212 - Uploading an archive fails on the slave node
Modified: modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CommandFactory.java
===================================================================
--- modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CommandFactory.java 2008-10-27 10:36:56 UTC (rev 12173)
+++ modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/CommandFactory.java 2008-10-27 10:47:05 UTC (rev 12174)
@@ -25,10 +25,8 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.cms.CMS;
import org.jboss.portal.search.impl.jcr.JCRQuery;
-import java.io.InputStream;
import java.util.List;
import java.util.Locale;
@@ -74,9 +72,9 @@
Command createContentCreateNewVersionCommand(List contents, boolean bMakeLive);
- Command createStoreArchiveCommand(String sRootPath, InputStream is, String sLanguage);
+ Command createStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage);
- Command createAsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage);
+ Command createAsyncStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage);
Command createItemExistsCommand(String sPath);
Modified: modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java
===================================================================
--- modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2008-10-27 10:36:56 UTC (rev 12173)
+++ modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/JCRCommandFactory.java 2008-10-27 10:47:05 UTC (rev 12174)
@@ -51,12 +51,10 @@
import org.jboss.portal.cms.model.Content;
import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.cms.CMS;
import org.jboss.portal.search.impl.jcr.JCRQuery;
import org.jboss.portal.cms.impl.jcr.command.AsyncStoreArchiveCommand;
-import java.io.InputStream;
import java.util.List;
import java.util.Locale;
@@ -155,14 +153,14 @@
return new ContentCreateNewVersionCommand(contents, bMakeLive);
}
- public Command createStoreArchiveCommand(String sRootPath, InputStream is, String sLanguage)
+ public Command createStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
- return new StoreArchiveCommand(sRootPath, is, sLanguage);
+ return new StoreArchiveCommand(sRootPath, archiveBytes, sLanguage);
}
- public Command createAsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage)
+ public Command createAsyncStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
- return new AsyncStoreArchiveCommand(cms,sRootPath, is, sLanguage);
+ return new AsyncStoreArchiveCommand(sRootPath, archiveBytes, sLanguage);
}
public Command createItemExistsCommand(String sPath)
Modified: modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java
===================================================================
--- modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java 2008-10-27 10:36:56 UTC (rev 12173)
+++ modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/AsyncStoreArchiveCommand.java 2008-10-27 10:47:05 UTC (rev 12174)
@@ -22,18 +22,20 @@
******************************************************************************/
package org.jboss.portal.cms.impl.jcr.command;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
import org.apache.log4j.Logger;
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.portal.cms.impl.jcr.JCRCMS;
import org.jboss.portal.cms.impl.jcr.JCRCommand;
import org.jboss.portal.cms.impl.jcr.JCRCommandContext;
+import org.jboss.portal.cms.CMS;
import org.jboss.portal.cms.CMSException;
-import java.io.InputStream;
-
-import org.jboss.portal.cms.CMS;
-
/**
* Saves an uploaded archive to the repo.
*
@@ -47,9 +49,8 @@
private static Logger log = Logger.getLogger(AsyncStoreArchiveCommand.class);
String msRootPath;
- InputStream mIS;
+ byte[] archiveBytes;
String msLanguage;
- CMS cms = null;
private Object user = null;
private Object approvePublishWorkflow = null;
@@ -60,12 +61,11 @@
* @param is
* @param sLanguage
*/
- public AsyncStoreArchiveCommand(CMS cms, String sRootPath, InputStream is, String sLanguage)
+ public AsyncStoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
this.msRootPath = sRootPath;
- this.mIS = is;
+ this.archiveBytes = archiveBytes;
this.msLanguage = sLanguage;
- this.cms = cms;
}
/**
@@ -111,7 +111,9 @@
JCRCMS.turnOnWorkflow();
}
- JCRCommand storeArchiveCommand = (JCRCommand)cms.getCommandFactory().createStoreArchiveCommand(msRootPath, mIS, msLanguage);
+ CMS cms = this.findCMSService();
+ JCRCommand storeArchiveCommand = (JCRCommand)cms.getCommandFactory().
+ createStoreArchiveCommand(msRootPath, archiveBytes, msLanguage);
cms.execute(storeArchiveCommand);
log.info("Async Processing finished..................");
@@ -123,5 +125,12 @@
log.error("-----------------------------------------------------------------------------");
}
}
+
+ //Find the CMS Service for the Asynchronous processing
+ private CMS findCMSService() throws Exception
+ {
+ MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+ return (CMS)MBeanProxy.get(CMS.class, new ObjectName("portal:service=CMS"), mbeanServer);
+ }
}
}
\ No newline at end of file
Modified: modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java
===================================================================
--- modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-10-27 10:36:56 UTC (rev 12173)
+++ modules/cms/tags/JBP_CMS_1_2_1/cms-jackrabbit/src/main/java/org/jboss/portal/cms/impl/jcr/command/StoreArchiveCommand.java 2008-10-27 10:47:05 UTC (rev 12174)
@@ -57,7 +57,7 @@
private static Logger log = Logger.getLogger(StoreArchiveCommand.class);
String msRootPath;
- InputStream mIS;
+ byte[] archiveBytes;
String msLanguage;
/**
@@ -65,10 +65,10 @@
* @param is
* @param sLanguage
*/
- public StoreArchiveCommand(String sRootPath, InputStream is, String sLanguage)
+ public StoreArchiveCommand(String sRootPath, byte[] archiveBytes, String sLanguage)
{
this.msRootPath = sRootPath;
- this.mIS = is;
+ this.archiveBytes = archiveBytes;
this.msLanguage = sLanguage;
}
@@ -271,13 +271,8 @@
FileOutputStream fos = new FileOutputStream(zipFile.getCanonicalPath());
try
{
- int count;
- byte[] data = new byte[1024];
- while ((count = this.mIS.read(data, 0, 1024)) != -1)
- {
- fos.write(data, 0, count);
- fos.flush();
- }
+ fos.write(this.archiveBytes);
+ fos.close();
}
finally
{
15 years, 8 months