[jboss-svn-commits] JBL Code SVN: r9027 - in labs/jbosslabs/trunk/portal-extensions-newprj: forge-common and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jan 25 16:36:37 EST 2007
Author: adamw
Date: 2007-01-25 16:36:37 -0500 (Thu, 25 Jan 2007)
New Revision: 9027
Removed:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/navigation/
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/service/
labs/jbosslabs/trunk/portal-extensions-newprj/forge-navigation/
Modified:
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/maven.xml
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
labs/jbosslabs/trunk/portal-extensions-newprj/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml
labs/jbosslabs/trunk/portal-extensions-newprj/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java
Log:
Removing navigation; cleaning up forge-common
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/maven.xml 2007-01-25 21:35:19 UTC (rev 9026)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/maven.xml 2007-01-25 21:36:37 UTC (rev 9027)
@@ -5,7 +5,7 @@
-->
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
<goal name="all">
-
+ <attainGoal name="prj-all" />
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2007-01-25 21:35:19 UTC (rev 9026)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2007-01-25 21:36:37 UTC (rev 9027)
@@ -44,7 +44,6 @@
import javax.portlet.PortletRequest;
import javax.servlet.ServletRequest;
-import org.jboss.forge.common.service.ForgeManagement;
import org.jboss.mx.util.MBeanProxyExt;
import org.jboss.mx.util.MBeanServerLocator;
import org.jboss.portlet.JBossRenderRequest;
@@ -119,9 +118,7 @@
private static VolatileTempFileRemover vtfRemover;
- static {
- forgeManagement = null;
-
+ static {
tempFiles = new Vector<String>();
volatileTempFiles = new TreeSet<Integer>();
@@ -130,31 +127,6 @@
vtfRemover.start();
}
- /**
- * <code>forgeManagement</code> - here we keep a looked up ForgeManagement
- * instance. This variable is filled with the correct value on first call.
- */
- private static ForgeManagement forgeManagement;
-
- /**
- * Gets an instance of the ForgeManagement class. It is looked up as a
- * mbean, if this is the first invocation of this function.
- *
- * @return An instance of the ForgeManagement class.
- */
- public synchronized static ForgeManagement getForgeManagement() {
- try {
- if (forgeManagement == null)
- forgeManagement = (ForgeManagement) MBeanProxyExt.create(
- ForgeManagement.class, FORGE_SERVICE_NAME,
- MBeanServerLocator.locate());
-
- return forgeManagement;
- } catch (MalformedObjectNameException e) {
- throw new RuntimeException(e);
- }
- }
-
@CacheItem
private static ForgePropertiesWatcher forgeProperties;
@@ -301,7 +273,6 @@
* Content of the message.
* @param from
* Address of this message's author.
- * @throws MessagingException
*/
public static void postMail(String recipient, String subject,
String message, String from) throws MessagingException {
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java 2007-01-25 21:35:19 UTC (rev 9026)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersWatcher.java 2007-01-25 21:36:37 UTC (rev 9027)
@@ -26,9 +26,6 @@
import java.util.Set;
import java.util.Map;
-import org.jboss.forge.common.service.NodeWatcher;
-import org.jboss.forge.common.service.ResourceWatcher;
-import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2007-01-25 21:35:19 UTC (rev 9026)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2007-01-25 21:36:37 UTC (rev 9027)
@@ -24,15 +24,7 @@
import java.io.IOException;
import java.util.Set;
-import javax.xml.bind.JAXBContext;
-
-import javax.xml.bind.JAXBException;
-
-import javax.xml.bind.Unmarshaller;
-
import org.apache.xerces.parsers.DOMParser;
-import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.common.navigation.Menu;
import org.jboss.forge.common.projects.XmlInputFactory.XmlNotFoundException;
import org.jboss.forge.common.projects.elements.BindingsHandlerIterSingleKey;
import org.jboss.forge.common.projects.elements.ExtendedPropertiesMap;
@@ -66,9 +58,6 @@
private ElementDescriptor thisProject;
- private Node menuNode;
- private Menu menu;
-
private Node repositoryNode;
private Repository repository;
@@ -181,12 +170,6 @@
if (issueTrackerNode != null) {
issueTracker = new IssueTracker(issueTrackerNode);
}
-
- // There should be a menu.
- if (menuNode != null) {
- menu = new Menu(portalName, menuNode, this);
- }
-
}
/**
@@ -247,9 +230,6 @@
}
public void processNode(ElementDescriptor thisElement, Node node) {
- if (Menu.MENU_ELEMENT.equals(node.getNodeName())) {
- setMenuNode(node);
- }
if (Repository.REPOSITORY_ELEMENT.equals(node.getNodeName())) {
setRepositoryNode(node);
}
@@ -270,20 +250,6 @@
return stack;
}
- private void setMenuNode(Node n) {
- menuNode = n;
- }
-
- /**
- * Gets a menu for this project.
- * @return An object representing this project's menu.
- */
- public Menu getMenu() {
- return menu;
- }
-
-
-
/*
private PropertiesHandler getFreezonePropertiesHandler() {
PropertiesHandlerStack ph = new PropertiesHandlerStack();
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2007-01-25 21:35:19 UTC (rev 9026)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2007-01-25 21:36:37 UTC (rev 9027)
@@ -25,7 +25,6 @@
import java.util.Map;
import java.util.Set;
-import org.jboss.forge.common.navigation.Menu;
import org.jboss.forge.common.projects.permissions.PermissionsChecker;
import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext;
@@ -232,27 +231,6 @@
}
/**
- * Gets a menu for the given project.
- * @param pc
- * @param projectId
- * @return A menu for the given project or null, if such a project doesn't
- * exist/ isn't accessible with the given permissions.
- */
- public Menu getProjectMenu(PermissionsChecker pc, String projectId) {
- ProjectsDescriptor pds = getProjectsDescriptor();
- if (pds.permissionAllowed(pc, projectId)) {
- ProjectDescriptor pd = pds.getProjectDescriptor(projectId);
- if (pd != null) {
- return pd.getMenu();
- } else {
- return null;
- }
- } else {
- return null;
- }
- }
-
- /**
* Gets a link to the given level.
* @return A link to the given level.
*/
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2007-01-25 21:35:19 UTC (rev 9026)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/forge-contributor/src/java/org/jboss/forge/contributor/ConServer.java 2007-01-25 21:36:37 UTC (rev 9027)
@@ -111,8 +111,7 @@
}
synchronized void resetDesc(String portalName) {
- ForgeHelper.getForgeManagement().forceNodeUpdate(portalName,
- ConServer.class.getName());
+ conf.update(portalName, null, null);
}
private boolean checkString(String s) {
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml 2007-01-25 21:35:19 UTC (rev 9026)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/maven.xml 2007-01-25 21:36:37 UTC (rev 9027)
@@ -260,6 +260,9 @@
<!-- Convenience goal that does clean, build, deploy -->
<goal name="all">
+ <!-- Removing legacy packages -->
+ <ant:delete file="${local.deploy.dir}/forge-navigation-portlet.sar" />
+
<ant:delete dir="${forge.jar.dest}" />
<attainGoal name="prepare-repo" />
Modified: labs/jbosslabs/trunk/portal-extensions-newprj/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions-newprj/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java 2007-01-25 21:35:19 UTC (rev 9026)
+++ labs/jbosslabs/trunk/portal-extensions-newprj/polls/src/java/org/jboss/forge/polls/PollsCacheItem.java 2007-01-25 21:36:37 UTC (rev 9027)
@@ -3,7 +3,6 @@
import org.jboss.shotoku.tools.Pair;
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
-import org.jboss.forge.common.service.ResourceWatcher;
import org.jboss.forge.common.projects.ProjectsHelper;
import java.util.Map;
More information about the jboss-svn-commits
mailing list