Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4762 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions: forge-ads forge-ads/src/java/org/jbosslabs/portlet/ads forge-blog/src/java/org/jboss/portlet/blog forge-common/src/java/org/jboss/forge/common/projects forge-mapper/src/java/org/jboss/labs/mapper forge-status/src/java/org/jboss/forge/status/tools forge-tagme/src/java/org/jboss/labs/tagme forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-tagme/src/java/org/jboss/labs/tagme/services jbosswiki/wiki-common/src/java/org/jboss/wiki portal-binaries/to-copy/jboss-portal.sar/META-INF portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user portal-binaries/to-copy/jboss-portal.sar/lib portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar portal-binaries/to-copy/jboss-portal.sar/portal-cms.sa! r/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF
Author: dam...@jb... Date: 2006-06-14 20:29:26 -0400 (Wed, 14 Jun 2006) New Revision: 4762 Added: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/forge-ads.iml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/ehcache.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-common-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-core-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-format-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-security-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-server-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms-lib.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF Log: MERGED: -r 4711:4761 https://svn.labs.jboss.com/labs/jbosslabs/trunk into qa for Labs 1.1 POST-promote testing. Bug fixes for prod. Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/forge-ads.iml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -28,6 +28,7 @@ import org.jboss.forge.common.projects.Projects; import org.jboss.forge.common.projects.ProjectsHelper; import org.jboss.forge.common.projects.permissions.NullPermissionsChecker; +import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker; import org.jboss.portal.core.servlet.jsp.PortalJsp; import org.jboss.portal.common.context.DelegateContext; import org.jboss.shotoku.exceptions.ResourceDoesNotExist; @@ -62,10 +63,10 @@ Projects projects = ProjectsHelper.getProjects(portalName); DelegateContext context = projects.getProjectContext( - new NullPermissionsChecker(), + new RenderRequestPermissionsChecker(rReq), projectId); - if ((context.childIterator("ads") != null) + if ((context != null) && (context.childIterator("ads") != null) && context.childIterator("ads").hasNext()) { return context; } else { // If project ads are not specified show default ads @@ -115,7 +116,7 @@ rReq.setAttribute(PortalJsp.CTX_REQUEST, content); writeJsp(rReq, rRes, fileName); } - + protected static String[] parse(String target) { String[] cnt; String[] separated; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -176,6 +176,10 @@ SyndFeed feed = blogFeed.get(new Triple<String, String, String>(portalName, projectId, feedAddress)); + if (feed == null) { + return; + } + WindowState ws = request.getWindowState(); String currentWindowState = "maximized"; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -133,7 +133,7 @@ Queue queue = null; queue = (Queue) ctx.lookup("queue/jblab_counters"); QueueConnectionFactory factory = - (QueueConnectionFactory) ctx.lookup("ConnectionFactory"); + (QueueConnectionFactory) ctx.lookup("java:/ConnectionFactory"); sess =factory.createQueueConnection().createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE); if (sess != null) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -51,8 +51,11 @@ String typeString = XmlTools.getAttributeValue(root, TYPE_ATTRIBUTE); type = JIRA_ISSUE_TRACKER; - if (typeString.equalsIgnoreCase(OTHER_ISSUE_TRACKER_STRING)) { - type = OTHER_ISSUE_TRACKER; + + if (typeString != null ) { + if (typeString.equalsIgnoreCase(OTHER_ISSUE_TRACKER_STRING)) { + type = OTHER_ISSUE_TRACKER; + } } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -60,12 +60,15 @@ type = SVN_REPOSITORY; // default type is SVN - if (typeString.equalsIgnoreCase(CVS_REPOSITORY_STRING)) { - type = SVN_REPOSITORY; + if (typeString != null) { + + if (typeString.equalsIgnoreCase(CVS_REPOSITORY_STRING)) { + type = SVN_REPOSITORY; + } + if (typeString.equalsIgnoreCase(OTHER_REPOSITORY_STRING)) { + type = OTHER_REPOSITORY; + } } - if (typeString.equalsIgnoreCase(OTHER_REPOSITORY_STRING)) { - type = OTHER_REPOSITORY; - } } public short getType() { Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -101,7 +101,6 @@ return (s == null) || ("".equals(s)); } - @Inject private ContentManager cm; private void setParamIfNotNull(Parameters params, String name, String value) { @@ -206,9 +205,10 @@ try { if (!Constants.PAGES_MIME_TYPE.equalsIgnoreCase(cm.getNode(cmsPath).getMimeType())) { sendRedirect(invocation, "/" + ForgeHelper.FILE_ACCESS_DIR + "/" + cmsPath); + return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE); } } catch (Exception e) { - + return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE); } setAttribute(invocation, Constants.ATTR_REQ_PATH, cmsPath); @@ -279,10 +279,6 @@ public ControllerCommand doMapping(ServerInvocation invocation, String portalContextPath, String portalRequestPath) throws InvocationException, InvocationRuntimeException { - /* TODO remove - System.out.println("REQUEST: " + portalRequestPath + - " ?" + invocation.getRequest().getContext().getClientRequest().getQueryString());*/ - // TODO temporary for freezone String projectParam = invocation.getRequest().getContext().getClientRequest() .getParameter(Constants.PROJECT_PARAM); @@ -290,6 +286,8 @@ setAttribute(invocation, Constants.PROJECT_PARAM, projectParam); } + + // Removing unnecessary /. while (portalRequestPath.indexOf("//") != -1) { portalRequestPath = portalRequestPath.replace("//", "/"); @@ -430,7 +428,7 @@ @Override protected void startService() throws Exception { - + cm = ContentManager.getContentManager(); } @Override Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -173,7 +173,7 @@ queue = (Queue) context.lookup(Constants.QUEUE_NAME); QueueConnectionFactory factory = - (QueueConnectionFactory) context.lookup("ConnectionFactory"); + (QueueConnectionFactory) context.lookup("java:/ConnectionFactory"); connection = factory.createQueueConnection(); session = connection.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -30,20 +30,23 @@ import com.google.gwt.user.server.rpc.RemoteServiceServlet; -public class TagMeServlet extends RemoteServiceServlet implements TaggingService { +public class TagMeServlet extends RemoteServiceServlet implements + TaggingService { private final static Logger log = Logger.getLogger(TagMeServlet.class); + /** * */ private static final long serialVersionUID = 1L; - + public Vector getTags(String path, String clas) { Vector vect = null; - + try { - TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance(); - + TagMeTagger tagger = (TagMeTagger) Class.forName(clas) + .newInstance(); + vect = tagger.getTags(path); } catch (InstantiationException e) { // TODO Auto-generated catch block @@ -55,21 +58,23 @@ // TODO Auto-generated catch block e.printStackTrace(); } - + return vect; } - + public boolean addTag(String user, String path, String clas, String tags) { try { - TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance(); - - log.info("tags: "+ tags + "\nspliter: "+TagMeClickListener.TAG_SEP); + TagMeTagger tagger = (TagMeTagger) Class.forName(clas) + .newInstance(); + + log.info("tags: " + tags + "\nspliter: " + + TagMeClickListener.TAG_SEP); String[] tagsTable = tags.split(TagMeClickListener.TAG_SEP); - + for (int i = 0; i < tagsTable.length; i++) { tagger.addTag(user, path, tagsTable[i]); } - + return true; } catch (InstantiationException e) { // TODO Auto-generated catch block @@ -88,25 +93,48 @@ public boolean deleteTag(String user, String path, String clas, String tag) { - try { - TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance(); - - tagger.deleteTag(user, path, tag); - - return true; - } catch (InstantiationException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IllegalAccessException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ClassNotFoundException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - return false; + try { + TagMeTagger tagger = (TagMeTagger) Class.forName(clas) + .newInstance(); + tagger.deleteTag(user, path, tag); + + return true; + } catch (InstantiationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalAccessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ClassNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return false; + } + public Vector getSugestions(String path, String clas) { + Vector vect = null; + + try { + TagMeTagger tagger = (TagMeTagger) Class.forName(clas) + .newInstance(); + + vect = tagger.getSuggestions(path); + } catch (InstantiationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalAccessException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (ClassNotFoundException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return vect; + } + } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -29,6 +29,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.ServiceDefTarget; import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Label; import com.google.gwt.user.client.ui.TextBox; @@ -51,15 +52,18 @@ private Button button; private TagMeShowPopupListener parent; + + private Vector suggestionCheckboxes; public TagMeClickListener(String path, String user, String clas, - Vector textBoxes, Label info, TagMeShowPopupListener parent) { + Vector textBoxes, Label info, Vector suggestionCheckboxes, TagMeShowPopupListener parent) { this.path = path; this.user = user; this.textBoxes = textBoxes; this.clas = clas; this.info = info; this.parent = parent; + this.suggestionCheckboxes = suggestionCheckboxes; } public void onClick(Widget sender) { @@ -100,6 +104,18 @@ } } } + + for (int i = 0; i < suggestionCheckboxes.size(); i++) { + CheckBox chBox = (CheckBox)suggestionCheckboxes.get(i); + + if (chBox.isChecked()) { + if (tags.length() == 0) { + tags = chBox.getText(); + } else { + tags += TAG_SEP + chBox.getText(); + } + } + } tagging.addTag(user, path, clas, tags, callback); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -30,6 +30,7 @@ import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.rpc.ServiceDefTarget; import com.google.gwt.user.client.ui.Button; +import com.google.gwt.user.client.ui.CheckBox; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.DialogBox; import com.google.gwt.user.client.ui.FlexTable; @@ -59,6 +60,10 @@ private Button saveBtn; + private FlexTable suggTable; + + private Vector suggestionCheckboxes; + public TagMeShowPopupListener(String path, String user, String clas) { this.path = path; this.currentUser = user; @@ -69,6 +74,42 @@ return this; } + public void refreshSugestions() { + suggestionCheckboxes = new Vector(); + + while (suggTable.getRowCount() > 0) { + table.removeRow(0); + } + + TaggingServiceAsync tagging = (TaggingServiceAsync) GWT + .create(TaggingService.class); + + ServiceDefTarget endpoint = (ServiceDefTarget) tagging; + endpoint.setServiceEntryPoint("/tagme-servlet/tag/"); + + AsyncCallback callback = new AsyncCallback() { + public void onSuccess(Object result) { + Vector vect = (Vector)result; + + int rowLen = (int)Math.sqrt(vect.size()); + + for (int i = 0; i < vect.size(); i++) { + CheckBox chBox = new CheckBox((String)vect.get(i)); + suggTable.setWidget(i / rowLen, i % rowLen, chBox); + suggestionCheckboxes.add(chBox); + } + } + + public void onFailure(Throwable caught) { + Window.alert("Error ! " + caught.getMessage() + " Throwable: " + + caught); + } + }; + + // call AJAX methos, after that callback is going to be executed + tagging.getSugestions(path, clas, callback); + } + public void refreshTags() { while (table.getRowCount() > 0) { @@ -98,10 +139,14 @@ String user = to[1]; String fullName = to[2]; String feed = to[3]; + String authorFeed = to[4]; if (!rows.keySet().contains(user)) { rows.put(user, new Integer(rowsNum)); - table.setHTML(rowsNum++, 0, "<b>" + fullName + "</b>"); + table + .setHTML(rowsNum++, 0, "<b><a href='" + + authorFeed + "' target='_blank' >" + + fullName + "</a></b>"); } int curRow = ((Integer) rows.get(user)).intValue(); @@ -111,8 +156,8 @@ Image im = new Image("/tagme-servlet/images/delete.gif"); HorizontalPanel hpanel = new HorizontalPanel(); - hpanel.add(new HTML("<a href='" + feed + "' target='_blank' >" + tag - + "</a>")); + hpanel.add(new HTML("<a href='" + feed + + "' target='_blank' >" + tag + "</a>")); hpanel.add(im); im.addClickListener(new DeleteTagClickListener( @@ -123,7 +168,8 @@ } else { // just show tag table.setHTML(curRow, table.getCellCount(curRow), - "<a href='" + feed + "' target='_blank' >" + tag + "</a>"); + "<a href='" + feed + "' target='_blank' >" + + tag + "</a>"); } } } @@ -136,6 +182,9 @@ // call AJAX methos, after that callback is going to be executed tagging.getTags(path, clas, callback); + + // refresh tags also + refreshSugestions(); } public void onClick(Widget sender) { @@ -149,21 +198,36 @@ panel.add(table); + HorizontalPanel hPanel = new HorizontalPanel(); + VerticalPanel input = new VerticalPanel(); + input.add(new Label("Add a Tag:")); + + hPanel.add(input); + + VerticalPanel suggestions = new VerticalPanel(); + suggTable = new FlexTable(); + suggestions.add(new Label("Suggestions:")); + suggestions.add(suggTable); + + hPanel.add(suggestions); + Vector textBoxes = new Vector(); for (int i = 0; i < 3; i++) { TextBox box = new TextBox(); textBoxes.add(box); - panel.add(box); + input.add(box); } + panel.add(hPanel); + refreshTags(); final DialogBox dialog = new DialogBox(); HorizontalPanel btnPanel = new HorizontalPanel(); this.saveBtn = new Button("Save", new TagMeClickListener(path, - currentUser, clas, textBoxes, info, this)); + currentUser, clas, textBoxes, info, suggestionCheckboxes, this)); btnPanel.add(saveBtn); btnPanel.add(new Button("Close", new ClickListener() { Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -44,4 +44,6 @@ public boolean addTag(String user, String path, String clas, String tags); public boolean deleteTag(String user, String path, String clas, String tag); + + public Vector getSugestions(String path, String clas); } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -38,4 +38,6 @@ public void deleteTag(String user, String path, String clas, String tag, AsyncCallback callback); + + public void getSugestions(String path, String clas, AsyncCallback callback); } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -45,8 +45,40 @@ private TagService service = TagTools.getService(); - public String getFeedForTag(String tag, String type) { - return service.getFeedLink(FeedType.TAGS, tag, type); + public Vector getSuggestions(String path) { + Vector<String> sugg = new Vector<String>(); + + try { + List<Tag> tags = service.getRelatedTags(service.getTags(path)); + + if (tags != null) { + for (Tag tag : tags) { + sugg.add(tag.getName()); + } + } + else { + //test data + sugg.add("Tag"); + sugg.add("Number"); + sugg.add("One"); + sugg.add("Poland"); + sugg.add("Rocks"); + sugg.add("Elephant"); + sugg.add("Bimbom"); + sugg.add("Tag1"); + sugg.add("Number2"); + sugg.add("One3"); + sugg.add("Poland4"); + sugg.add("Rocks5"); + sugg.add("Elephant6"); + sugg.add("Bimbom7"); + } + } catch (TagGetException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + return sugg; } public Vector getTags(String path) { @@ -65,6 +97,9 @@ + tag.getAuthor() + TagMeClickListener.TAG_SEP + service.getFeedLink(FeedType.TAGS, tag.getName(), + "rss2") + + TagMeClickListener.TAG_SEP + + service.getFeedLink(FeedType.AUTHOR, tag.getAuthor(), "rss2")); } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -30,5 +30,5 @@ public void deleteTag(String user, String path, String tag); - public String getFeedForTag(String tag, String type); + public Vector getSuggestions(String path); } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -22,12 +22,13 @@ package org.jboss.wiki; import java.io.File; +import java.io.FileDescriptor; import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.FileWriter; import java.io.IOException; +import java.io.InputStreamReader; +import java.io.PrintWriter; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -66,6 +67,8 @@ private static final String propModFileName = "fileMod.properties"; + private static final String CHARSET = "UTF-8"; + private String pathToMediaTrash; private String pathToMedia; @@ -182,7 +185,7 @@ // harddisk - add new // version - Properties pageProps = getPageProps(uidTranslated); + Properties pageProps = getPageProps(uid); pageProps.setProperty(page.getLastVersion() + ".author", page .getLastAuthor().getName()); @@ -201,12 +204,12 @@ File pageOldFile = new File(pathToMedia + "/" + uidTranslated + ".txt"); - FileWriter pageFileWriter; - FileReader pageFileReader; + PrintWriter pageFileWriter; + InputStreamReader pageFileReader; try { - pageFileWriter = new FileWriter(pageFile); - pageFileReader = new FileReader(pageOldFile); + pageFileWriter = new PrintWriter(pageFile, CHARSET); + pageFileReader = new InputStreamReader(new FileInputStream(pageOldFile), CHARSET); int b; @@ -220,13 +223,14 @@ pageOldFile.delete(); - pageFileWriter = new FileWriter(pageOldFile); + pageFileWriter = new PrintWriter(pageOldFile, CHARSET); String pageContent = page.getContent(); - for (int i = 0; i < pageContent.length(); i++) { + pageFileWriter.write(pageContent); + /*for (int i = 0; i < pageContent.length(); i++) { pageFileWriter.write((int) pageContent.charAt(i)); - } + }*/ pageFileWriter.close(); } catch (FileNotFoundException fnfe) { @@ -269,14 +273,16 @@ pageDir.mkdirs(); - FileWriter pageWriter = new FileWriter(new File(pathToMedia - + "/" + uidTranslated + ".txt")); + PrintWriter pageWriter = new PrintWriter(new File(pathToMedia + + "/" + uidTranslated + ".txt"), CHARSET); String pageContent = page.getContent(); - for (int i = 0; i < pageContent.length(); i++) { + pageWriter.write(pageContent); + + /*for (int i = 0; i < pageContent.length(); i++) { pageWriter.write((int) pageContent.charAt(i)); - } + }*/ pageWriter.close(); @@ -298,21 +304,22 @@ public Properties getPageProps(String pageName) { Properties pageProps = new Properties(); + String translatedPageName = FileDSCommons.translateToFileName(pageName); try { FileInputStream fpi = new FileInputStream(new File(pathToMedia - + "/OLD/" + pageName + "/page.properties")); + + "/OLD/" + translatedPageName + "/page.properties")); pageProps.load(fpi); fpi.close(); } catch (IOException ioe) { // There is no prop file for some reson - create one. - File pagePropsFile = new File(pathToMedia + "/OLD/" + pageName); + File pagePropsFile = new File(pathToMedia + "/OLD/" + translatedPageName); // create dirs pagePropsFile.mkdirs(); // create file - pagePropsFile = new File(pathToMedia + "/OLD/" + pageName + pagePropsFile = new File(pathToMedia + "/OLD/" + translatedPageName + "/page.properties"); try { @@ -451,7 +458,7 @@ StringBuilder pageContent = new StringBuilder(); try { - FileReader input = new FileReader(pageFile); + InputStreamReader input = new InputStreamReader(new FileInputStream(pageFile), CHARSET); // FileInputStream input = new FileInputStream(pageFile); int nextChr = input.read(); @@ -556,13 +563,14 @@ boolean loadContent, int version) { StringBuilder ret = null; - File pageFile = new File(pathToMedia + "/OLD/" + uid + "/" + version + File pageFile = new File(pathToMedia + "/OLD/" + FileDSCommons.translateToFileName(uid) + "/" + version + ".txt"); if (loadContent) { try { - FileReader input = new FileReader(pageFile); - + + InputStreamReader input = new InputStreamReader(new FileInputStream(pageFile), CHARSET); + int nextChr = input.read(); ret = new StringBuilder(); @@ -837,7 +845,9 @@ return new Properties(); } - File propsFile = new File(pathToMedia + "/OLD/" + uid + String uidTranslated = FileDSCommons.translateToFileName(uid); + + File propsFile = new File(pathToMedia + "/OLD/" + uidTranslated + "/metadata.properties"); if (!propsFile.exists()) { Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java 2006-06-15 00:29:26 UTC (rev 4762) @@ -82,7 +82,7 @@ try { queue = (Queue) context.lookup("queue/wikiNotifications"); QueueConnectionFactory factory = (QueueConnectionFactory) context - .lookup("ConnectionFactory"); + .lookup("java:/ConnectionFactory"); sess = factory.createQueueConnection().createQueueSession( false, QueueSession.AUTO_ACKNOWLEDGE); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF 2006-06-15 00:29:26 UTC (rev 4762) @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.6.5 -Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.) +Created-By: 1.4.2-66 ("Apple Computer, Inc.") Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml 2006-06-15 00:29:26 UTC (rev 4762) @@ -8,6 +8,7 @@ <property name="show_sql">false</property> <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + <property name="cache.provider_configuration_file_resource_path">conf/hibernate/instance/ehcache.xml</property> <!-- | Uncomment in clustered mode : use transactional replicated cache Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml 2006-06-15 00:29:26 UTC (rev 4762) @@ -8,6 +8,7 @@ <property name="show_sql">false</property> <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portal/ehcache.xml</property> <!-- | Uncomment in clustered mode : use transactional replicated cache Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml 2006-06-15 00:29:26 UTC (rev 4762) @@ -11,6 +11,7 @@ <property name="transaction.auto_close_session">false</property> <property name="transaction.flush_before_completion">false</property> <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> + <property name="cache.provider_configuration_file_resource_path">conf/hibernate/security/ehcache.xml</property> <!-- Force the dialect instead of using autodetection --> <!-- Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml 2006-06-15 00:29:26 UTC (rev 4762) @@ -8,6 +8,7 @@ <property name="show_sql">false</property> <property name="cache.use_second_level_cache">true</property> <property name="cache.use_query_cache">true</property> + <property name="cache.provider_configuration_file_resource_path">conf/hibernate/user/ehcache.xml</property> <!-- | Uncomment in clustered mode : use transactional replicated cache Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/ehcache.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-common-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-core-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-format-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-security-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-server-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF 2006-06-15 00:29:26 UTC (rev 4762) @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.6.5 -Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.) +Created-By: 1.4.2-66 ("Apple Computer, Inc.") Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms-lib.jar =================================================================== (Binary files differ) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF 2006-06-15 00:29:26 UTC (rev 4762) @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.6.5 -Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.) +Created-By: 1.4.2-66 ("Apple Computer, Inc.") Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF 2006-06-15 00:29:26 UTC (rev 4762) @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.6.5 -Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.) +Created-By: 1.4.2-66 ("Apple Computer, Inc.") Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF 2006-06-15 00:29:26 UTC (rev 4762) @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.6.5 -Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.) +Created-By: 1.4.2-66 ("Apple Computer, Inc.") Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF 2006-06-14 23:20:49 UTC (rev 4761) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF 2006-06-15 00:29:26 UTC (rev 4762) @@ -1,4 +1,4 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.6.5 -Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.) +Created-By: 1.4.2-66 ("Apple Computer, Inc.") |
