[jboss-svn-commits] JBL Code SVN: r10180 - in labs/jbosslabs/trunk/portal-extensions: binaries/mysql and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Mar 14 12:24:33 EDT 2007
Author: szimano
Date: 2007-03-14 12:24:33 -0400 (Wed, 14 Mar 2007)
New Revision: 10180
Added:
labs/jbosslabs/trunk/portal-extensions/binaries/mysql/mysql-connector-java-5.0.5-bin.jar
Removed:
labs/jbosslabs/trunk/portal-extensions/binaries/mysql/mysql-connector-java-3.1.12-bin.jar
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/MetaMoveFilter.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/LabsDialogBox.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java
labs/jbosslabs/trunk/portal-extensions/maven.xml
Log:
mysql connector 5.0.5
Deleted: labs/jbosslabs/trunk/portal-extensions/binaries/mysql/mysql-connector-java-3.1.12-bin.jar
===================================================================
(Binary files differ)
Added: labs/jbosslabs/trunk/portal-extensions/binaries/mysql/mysql-connector-java-5.0.5-bin.jar
===================================================================
(Binary files differ)
Property changes on: labs/jbosslabs/trunk/portal-extensions/binaries/mysql/mysql-connector-java-5.0.5-bin.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/MetaMoveFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/MetaMoveFilter.java 2007-03-14 16:19:47 UTC (rev 10179)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/MetaMoveFilter.java 2007-03-14 16:24:33 UTC (rev 10180)
@@ -21,8 +21,10 @@
*/
package org.jboss.forge.portal;
+import java.awt.Point;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.Vector;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -69,10 +71,26 @@
StringBuffer newContent = new StringBuffer(content);
Matcher matcher = Pattern.compile("<meta.*/>").matcher(content);
-
+
+ Vector<Point> metas = new Vector<Point>();
+
+ int headPos = newContent.indexOf("<head>") + "<head>".length();
+
+ //prepare matchers
while (matcher.find()) {
- String meta = content.substring(matcher.start(), matcher.end());
- newContent.insert(newContent.indexOf("<head>") + "<head>".length(),
+ metas.add(new Point(matcher.start(), matcher.end()));
+ }
+
+ // remove metas
+ for (int i = metas.size() - 1; i >= 0; i--) {
+ if (metas.get(i).x > headPos);
+ newContent.delete(metas.get(i).x, metas.get(i).y);
+ }
+
+ // insert new metas
+ for (int i = 0; i < metas.size(); i++) {
+ String meta = content.substring(metas.get(i).x, metas.get(i).y);
+ newContent.insert(headPos,
meta);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-03-14 16:19:47 UTC (rev 10179)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-03-14 16:24:33 UTC (rev 10180)
@@ -22,16 +22,21 @@
package org.jboss.forge.projects.downloads;
import java.io.IOException;
+import java.util.Comparator;
import java.util.List;
+import java.util.Set;
+import java.util.TreeSet;
import javax.portlet.PortletRequestDispatcher;
import org.jboss.forge.common.Constants;
import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.ejb3.LabsServices;
+import org.jboss.forge.common.exceptions.ServiceRetrievalException;
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.common.projects.project.Category;
+import org.jboss.forge.common.projects.project.File;
import org.jboss.portlet.JBossPortlet;
import org.jboss.portlet.JBossRenderRequest;
import org.jboss.portlet.JBossRenderResponse;
@@ -63,15 +68,13 @@
+ DOWNLOADS);
// Getting the selected category (null if no selected category)
- String categoryId = request.getParameter(
- Constants.FREEZONE_PATH_PARAM);
+ String categoryId = request
+ .getParameter(Constants.FREEZONE_PATH_PARAM);
// Getting the appropriate context
- List<? extends Category> categories = LabsServices
- .getProjectsService().getProjectDownloads(projectId)
- .getCategories().getCategory();
+ Set<File> files = getAllFiles(projectId);
- request.setAttribute(DownloadsConstants.CATEGORIES, categories);
+ request.setAttribute(DownloadsConstants.FILES, files);
// Setting the attributes
// request.setAttribute(PortalJsp.CTX_REQUEST, context);
@@ -97,4 +100,39 @@
response.getWriter().write("ERROR: " + e.getMessage());
}
}
+
+ private Set<File> getAllFiles(String projectId)
+ throws ServiceRetrievalException {
+ Set<File> allFiles = new TreeSet<File>(new Comparator<File>() {
+
+ public int compare(File o1, File o2) {
+ return o1.getRelease().compareTo(o2.getRelease());
+ }
+
+ });
+
+ addFiles(allFiles, LabsServices.getProjectsService()
+ .getProjectDownloads(projectId).getFiles().getFile());
+
+ for (Category c : LabsServices.getProjectsService()
+ .getProjectDownloads(projectId).getCategories().getCategory()) {
+ addFilesFromCategory(allFiles, c);
+ }
+
+ return allFiles;
+ }
+
+ private void addFilesFromCategory(Set<File> allFiles, Category category) {
+ for (Category c : category.getCategories().getCategory()) {
+ addFilesFromCategory(allFiles, c);
+ }
+
+ addFiles(allFiles, category.getFiles().getFile());
+ }
+
+ private void addFiles(Set<File> allFiles, List<? extends File> filesToAdd) {
+
+ allFiles.addAll(filesToAdd);
+
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java 2007-03-14 16:19:47 UTC (rev 10179)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java 2007-03-14 16:24:33 UTC (rev 10180)
@@ -30,4 +30,5 @@
public class DownloadsConstants {
public static final String CATEGORIES = "CATEGORIES";
+ public static final String FILES = "FILES";
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/LabsDialogBox.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/LabsDialogBox.java 2007-03-14 16:19:47 UTC (rev 10179)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/LabsDialogBox.java 2007-03-14 16:24:33 UTC (rev 10180)
@@ -5,12 +5,12 @@
public class LabsDialogBox extends DialogBox {
- public void setPopupPosition(int left, int top) {
+ /*public void setPopupPosition(int left, int top) {
DOM.setStyleAttribute(this.getElement(), "position", "absolute");
DOM.setStyleAttribute(this.getElement(), "left", String.valueOf(left)
+ "px");
DOM.setStyleAttribute(this.getElement(), "top", String.valueOf(top)
+ "px");
- }
+ }*/
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2007-03-14 16:19:47 UTC (rev 10179)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2007-03-14 16:24:33 UTC (rev 10180)
@@ -125,7 +125,7 @@
}
public void onClick(Widget sender) {
-
+
dialog = new LabsDialogBox();
browseTags = new BrowseTagsPanel(path, currentUser, clas, website,
@@ -185,9 +185,10 @@
+ "<tr><td class='tagme-title'>Tag Me</td>"
+ "<td class='tagme-controls'><div id='controlsdiv'> </div></td></tr></table>");
- dialog.setPopupPosition(DOM.getAbsoluteLeft(parentButton.getElement()),
- DOM.getAbsoluteTop(parentButton.getElement()));
-
+ //dialog.setPopupPosition(DOM.getAbsoluteLeft(parentButton.getElement()),
+ // DOM.getAbsoluteTop(parentButton.getElement()));
+
+ dialog.setSize("200px", "200px");
dialog.show();
DOM.setAttribute(closeDialogButton.getElement(), "alt", "Close");
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java 2007-03-14 16:19:47 UTC (rev 10179)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagmeSet.java 2007-03-14 16:24:33 UTC (rev 10180)
@@ -24,12 +24,17 @@
public class TagmeSet {
private String div;
+
private String path;
+
private String user;
+
private String clas;
+
private boolean website;
-
- public TagmeSet(String div, String path, String user, String clas, boolean website) {
+
+ public TagmeSet(String div, String path, String user, String clas,
+ boolean website) {
this.div = div;
this.path = path;
this.user = user;
@@ -57,4 +62,9 @@
return website;
}
+ public String toString() {
+ return super.toString() + "[path=" + path + ";div=" + div + ";user="
+ + user + ";class=" + clas + ";website=" + website + "]";
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/maven.xml 2007-03-14 16:19:47 UTC (rev 10179)
+++ labs/jbosslabs/trunk/portal-extensions/maven.xml 2007-03-14 16:24:33 UTC (rev 10180)
@@ -218,7 +218,7 @@
</ant:copy>
<ant:copy todir="${local.deploy.dir}/../lib" overwrite="true"
- file="binaries/mysql/mysql-connector-java-3.1.12-bin.jar" />
+ file="binaries/mysql/mysql-connector-java-5.0.5-bin.jar" />
<j:set var="goal" value="prj-install" />
<attainGoal name="multiproject:goal" />
More information about the jboss-svn-commits
mailing list