You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2008/06/20 23:23:46 UTC
svn commit: r670067 - in /geronimo/server/branches/2.1/plugins/console:
plugin-console-jetty/src/main/plan/ plugin-console-tomcat/src/main/plan/
plugin-portlets/src/main/java/org/apache/geronimo/console/car/
plugin-portlets/src/main/resources/ plugin-p...
Author: gawor
Date: Fri Jun 20 14:23:46 2008
New Revision: 670067
URL: http://svn.apache.org/viewvc?rev=670067&view=rev
Log:
split plugin portlet into 3 sub portlets and other minor layout improvements (GERONIMO-3868)
Added:
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java (with props)
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java (with props)
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginIndexHandler.java (with props)
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginPortlet.java (with props)
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp (with props)
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp (with props)
Modified:
geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.java
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ImportExportPortlet.java
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/IndexHandler.java
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ListHandler.java
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp
geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml
Modified: geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-console-jetty/src/main/plan/plan.xml Fri Jun 20 14:23:46 2008
@@ -52,7 +52,7 @@
<gbean name="PluginManagement" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
<attribute name="pageTitle">Applications/Plugins</attribute>
<attribute name="portletContext">/plugin</attribute>
- <attribute name="portletList">[ImportExport]</attribute>
+ <attribute name="portletList">[ImportExport, CreatePlugin, AssembleServer]</attribute>
<attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
Modified: geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml Fri Jun 20 14:23:46 2008
@@ -52,7 +52,7 @@
<gbean name="PluginManagement" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
<attribute name="pageTitle">Applications/Plugins</attribute>
<attribute name="portletContext">/plugin</attribute>
- <attribute name="portletList">[ImportExport]</attribute>
+ <attribute name="portletList">[ImportExport, CreatePlugin, AssembleServer]</attribute>
<attribute name="icon">/images/ico_list_16x16.gif</attribute>
<reference name="PortalContainerServices">
<name>PlutoPortalServices</name>
Added: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java?rev=670067&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java (added)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java Fri Jun 20 14:23:46 2008
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.console.car;
+
+import java.io.IOException;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+
+import org.apache.geronimo.console.MultiPageModel;
+
+/**
+ * Handler for the assemble a server main screen.
+ *
+ * @version $Rev: 609072 $ $Date: 2008-01-04 19:47:14 -0500 (Fri, 04 Jan 2008) $
+ */
+public class AssemblyIndexHandler extends BaseImportExportHandler {
+ public AssemblyIndexHandler() {
+ super(INDEX_MODE, "/WEB-INF/view/car/assemblyIndex.jsp");
+ }
+
+ public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+ response.setWindowState(WindowState.NORMAL);
+ return getMode();
+ }
+
+ public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
+ }
+
+ public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+ return LIST_MODE+BEFORE_ACTION;
+ }
+}
Propchange: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyIndexHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.java?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyListHandler.java Fri Jun 20 14:23:46 2008
@@ -23,6 +23,7 @@
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
import org.apache.geronimo.console.MultiPageModel;
import org.apache.geronimo.system.plugin.PluginInstaller;
@@ -53,6 +54,9 @@
if(!isEmpty(artifactId)) response.setRenderParameter("artifactId", artifactId);
response.setRenderParameter("version", isEmpty(version) ? "1.0" : version);
if(!isEmpty(format)) response.setRenderParameter("format", format);
+
+ response.setWindowState(WindowState.MAXIMIZED);
+
return getMode();
}
Added: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java?rev=670067&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java (added)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java Fri Jun 20 14:23:46 2008
@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.console.car;
+
+import org.apache.geronimo.console.MultiPagePortlet;
+import org.apache.geronimo.console.MultiPageModel;
+
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+
+/**
+ * Portlet for assembling a server.
+ *
+ * @version $Rev: 627838 $ $Date: 2008-02-14 13:54:30 -0500 (Thu, 14 Feb 2008) $
+ */
+public class AssemblyPortlet extends MultiPagePortlet {
+ public void init(PortletConfig config) throws PortletException {
+ super.init(config);
+ addHelper(new AssemblyIndexHandler(), config);
+ addHelper(new AssemblyConfirmHandler(), config);
+ addHelper(new AssemblyListHandler(), config);
+ addHelper(new AssemblyViewHandler(), config);
+ }
+
+ protected String getModelJSPVariableName() {
+ return "model";
+ }
+
+ protected MultiPageModel getModel(PortletRequest request) {
+ return null;
+ }
+}
Propchange: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/AssemblyPortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginIndexHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginIndexHandler.java?rev=670067&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginIndexHandler.java (added)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginIndexHandler.java Fri Jun 20 14:23:46 2008
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.console.car;
+
+import java.io.IOException;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+
+import org.apache.geronimo.console.MultiPageModel;
+import org.apache.geronimo.console.util.ConfigurationData;
+import org.apache.geronimo.console.util.PortletManager;
+
+/**
+ * Handler for the create a plugin main screen.
+ *
+ * @version $Rev: 609072 $ $Date: 2008-01-04 19:47:14 -0500 (Fri, 04 Jan 2008) $
+ */
+public class CreatePluginIndexHandler extends BaseImportExportHandler {
+ public CreatePluginIndexHandler() {
+ super(INDEX_MODE, "/WEB-INF/view/car/createPluginIndex.jsp");
+ }
+
+ public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+ response.setWindowState(WindowState.NORMAL);
+ return getMode();
+ }
+
+ public void renderView(RenderRequest request, RenderResponse response, MultiPageModel model) throws PortletException, IOException {
+ ConfigurationData[] configs = PortletManager.getConfigurations(request, null, false);
+ request.setAttribute("configurations", configs);
+ }
+
+ public String actionAfterView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
+ return LIST_MODE+BEFORE_ACTION;
+ }
+}
Propchange: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginIndexHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginPortlet.java?rev=670067&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginPortlet.java (added)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginPortlet.java Fri Jun 20 14:23:46 2008
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.console.car;
+
+import org.apache.geronimo.console.MultiPagePortlet;
+import org.apache.geronimo.console.MultiPageModel;
+
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+
+/**
+ * Portlet for creating a plugin.
+ *
+ * @version $Rev: 627838 $ $Date: 2008-02-14 13:54:30 -0500 (Thu, 14 Feb 2008) $
+ */
+public class CreatePluginPortlet extends MultiPagePortlet {
+ public void init(PortletConfig config) throws PortletException {
+ super.init(config);
+ addHelper(new CreatePluginIndexHandler(), config);
+ addHelper(new ExportConfigHandler(), config);
+ addHelper(new ExportHandler(), config);
+ }
+
+ protected String getModelJSPVariableName() {
+ return "model";
+ }
+
+ protected MultiPageModel getModel(PortletRequest request) {
+ return null;
+ }
+}
Propchange: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/CreatePluginPortlet.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ExportConfigHandler.java Fri Jun 20 14:23:46 2008
@@ -27,6 +27,7 @@
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -61,6 +62,9 @@
if (configId != null) {
response.setRenderParameter("configId", configId);
}
+
+ response.setWindowState(WindowState.MAXIMIZED);
+
return getMode();
}
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ImportExportPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ImportExportPortlet.java?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ImportExportPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ImportExportPortlet.java Fri Jun 20 14:23:46 2008
@@ -34,15 +34,10 @@
addHelper(new IndexHandler(), config);
addHelper(new ListHandler(), config);
addHelper(new ResultsHandler(), config);
- addHelper(new ExportConfigHandler(), config);
- addHelper(new ExportHandler(), config);
addHelper(new DownloadStatusHandler(), config);
addHelper(new UpdateListHandler(), config);
addHelper(new AddRepositoryHandler(), config);
addHelper(new ViewPluginDownloadHandler(), config);
- addHelper(new AssemblyConfirmHandler(), config);
- addHelper(new AssemblyListHandler(), config);
- addHelper(new AssemblyViewHandler(), config);
}
protected String getModelJSPVariableName() {
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/IndexHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/IndexHandler.java?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/IndexHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/IndexHandler.java Fri Jun 20 14:23:46 2008
@@ -26,10 +26,9 @@
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
import org.apache.geronimo.console.MultiPageModel;
-import org.apache.geronimo.console.util.ConfigurationData;
-import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.system.plugin.PluginRepositoryList;
/**
@@ -45,6 +44,7 @@
public String actionBeforeView(ActionRequest request, ActionResponse response, MultiPageModel model) throws PortletException, IOException {
String repo = request.getParameter("repository");
if(repo != null) response.setRenderParameter("repository", repo);
+ response.setWindowState(WindowState.NORMAL);
return getMode();
}
@@ -58,8 +58,7 @@
for (PluginRepositoryList repo: lists) {
list.addAll(repo.getRepositories());
}
- ConfigurationData[] configs = PortletManager.getConfigurations(request, null, false);
- request.setAttribute("configurations", configs);
+
request.setAttribute("repositories", list);
String repository = request.getParameter("repository");
request.setAttribute("repository", repository);
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ListHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ListHandler.java?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ListHandler.java (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/java/org/apache/geronimo/console/car/ListHandler.java Fri Jun 20 14:23:46 2008
@@ -24,6 +24,7 @@
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
import javax.security.auth.login.FailedLoginException;
import org.apache.geronimo.console.MultiPageModel;
@@ -54,6 +55,9 @@
if(!isEmpty(user)) response.setRenderParameter("repo-user", user);
if(!isEmpty(pass)) response.setRenderParameter("repo-pass", pass);
if(!isEmpty(column)) response.setRenderParameter("column", column);
+
+ response.setWindowState(WindowState.MAXIMIZED);
+
return getMode();
}
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/resources/pluginportlets.properties Fri Jun 20 14:23:46 2008
@@ -65,7 +65,7 @@
car.index.createGeronimoPluginExp = Choose a configuration in the current Geronimo server to export as a Geronimo plugin. The configuration will be saved as a CAR file to your local filesystem. <i>Note: at present, you must manually add a <tt>META-INF/geronimo-plugin.xml</tt> file to the CAR after you export it in order for it to be a valid plugin.</i>
car.index.optionalAuthentication = Optional Authentication
car.index.removePluginsExp = To remove a plugin, use the categories under <b>Applications</b> to locate the plugin module and uninstall it.
-car.index.summary = <p>This portlet lets you install or create Geronimo plugins. This can be used to install new features into a Geronimo server at runtime.</p> <h2>Install Geronimo Plugins</h2> <p>Choose a remote repository to inspect for available Geronimo plugins. The repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory listing the available plugins in the repository.</p> <p>You can also download running configurations from another Geronimo server just as if you're browsing and installing third-party plugins. If you want to point to a remote Geronimo server, enter a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt> and the enter the administrator username and password in the optional authentication fields.</p>
+car.index.summary = <h2>Install Geronimo Plugins</h2> <p>This portlet lets you install Geronimo plugins. This can be used to install new features into a Geronimo server at runtime.</p> <p>Choose a remote repository to inspect for available Geronimo plugins. The repository must have a <tt>geronimo-plugins.xml</tt> file in the root directory listing the available plugins in the repository.</p> <p>You can also download running configurations from another Geronimo server just as if you're browsing and installing third-party plugins. If you want to point to a remote Geronimo server, enter a URL such as <tt>http://geronimo-server:8080/plugin/maven-repo/</tt> and the enter the administrator username and password in the optional authentication fields.</p>
car.index.updateRepositoryList = Update Repository List
car.index.validateConfig = Please select a configuration to export.
car.list.assemblyArtifactId = Assembly artifactId:
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/portlet.xml Fri Jun 20 14:23:46 2008
@@ -55,9 +55,45 @@
</supports>
<supported-locale>en</supported-locale>
<portlet-info>
- <title>Create and Install Plugins</title>
- <short-title>Create/Install Plugins</short-title>
- <keywords>Import Export Create Install Plugins Modules</keywords>
+ <title>Install Plugins</title>
+ <short-title>Install Plugins</short-title>
+ <keywords>Import Install Plugins Modules</keywords>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <description>Assemble Server Portlet</description>
+ <portlet-name>AssembleServer</portlet-name>
+ <display-name>Assemble Server Portlet</display-name>
+ <portlet-class>org.apache.geronimo.console.car.AssemblyPortlet</portlet-class>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <portlet-info>
+ <title>Assemble Server</title>
+ <short-title>Assemble Server</short-title>
+ <keywords>Assemble Server Plugins Modules</keywords>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <description>Create Plugin Portlet</description>
+ <portlet-name>CreatePlugin</portlet-name>
+ <display-name>Create Plugin Portle</display-name>
+ <portlet-class>org.apache.geronimo.console.car.CreatePluginPortlet</portlet-class>
+ <expiration-cache>-1</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ <portlet-mode>VIEW</portlet-mode>
+ </supports>
+ <supported-locale>en</supported-locale>
+ <portlet-info>
+ <title>Create Plugin</title>
+ <short-title>Create Plugin</short-title>
+ <keywords>Create Export Plugins Modules</keywords>
</portlet-info>
</portlet>
Added: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp?rev=670067&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp (added)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp Fri Jun 20 14:23:46 2008
@@ -0,0 +1,31 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="pluginportlets"/>
+
+<portlet:defineObjects/>
+
+<h2><fmt:message key="car.index.assembleServerLong"/></h2>
+
+<form name="<portlet:namespace/>AssemblyForm" action="<portlet:actionURL/>" method="POST">
+ <input type="hidden" name="mode" value="listServer-before"/>
+ <input type="submit" value='<fmt:message key="car.index.assembleServer"/>'/>
+</form>
+
Propchange: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblyIndex.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/assemblylist.jsp Fri Jun 20 14:23:46 2008
@@ -51,14 +51,33 @@
<form name="frmlst" action="<portlet:actionURL/>">
<h3>Name the server to be assembled</h3>
<input id="mode" type="hidden" name="mode" value="assemblyView-before"/>
- <p><fmt:message key="car.list.assemblyPath"/><input type="text" name="relativeServerPath" value="${relativeServerPath}"/></p>
- <p><fmt:message key="car.list.assemblyGroupId"/><input type="text" name="groupId" value="${groupId}"/></p>
- <p><fmt:message key="car.list.assemblyArtifactId"/><input type="text" name="artifactId" value="${artifactId}"/></p>
- <p><fmt:message key="car.list.assemblyVersion"/><input type="text" name="version" value="${version}"/></p>
- <p><fmt:message key="car.list.assemblyFormat"/><select name="format">
+
+<table border="0" cellpadding="3">
+<tr>
+ <td><fmt:message key="car.list.assemblyGroupId"/></td>
+ <td><input type="text" name="groupId" value="${groupId}"/></td>
+</tr>
+<tr>
+ <td><fmt:message key="car.list.assemblyArtifactId"/></td>
+ <td><input type="text" name="artifactId" value="${artifactId}"/></td>
+</tr>
+<tr>
+ <td><fmt:message key="car.list.assemblyVersion"/></td>
+ <td><input type="text" name="version" value="${version}"/></td>
+</tr>
+<tr>
+ <td><fmt:message key="car.list.assemblyPath"/></td>
+ <td><input type="text" name="relativeServerPath" value="${relativeServerPath}"/></td>
+</tr>
+<tr>
+ <td><fmt:message key="car.list.assemblyFormat"/></td>
+ <td><select name="format">
<option <c:if test="${format ne 'zip'}">selected="true"</c:if>>tar.gz</option>
<option <c:if test="${format eq 'zip'}">selected="true"</c:if>>zip</option>
- </select></p>
+ </select>
+ </td>
+</table>
+
<h3><fmt:message key="car.list.pluginLocal"/></h3>
<table border="0" cellpadding="3">
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/confirmExport.jsp Fri Jun 20 14:23:46 2008
@@ -34,4 +34,5 @@
<form action="/console/forwards/car-export" method="GET">
<input type="hidden" name="configId" value="${configId}" />
<input type="submit" value='<fmt:message key="car.common.exportPlugin" />' />
+ <input type="submit" value='<fmt:message key="consolebase.common.done" />' onclick="history.go(-2); return false;" />
</form>
Added: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp?rev=670067&view=auto
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp (added)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp Fri Jun 20 14:23:46 2008
@@ -0,0 +1,53 @@
+<%--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<fmt:setBundle basename="pluginportlets"/>
+
+<script>
+function <portlet:namespace/>validateForm(){
+ with(document.<portlet:namespace/>ExportForm){
+ selected = configId.options[configId.selectedIndex].text;
+ if (selected==null || selected=="") {
+ alert("<fmt:message key="car.index.validateConfig"/>");
+ return false;
+ }
+ }
+ return true;
+}
+</script>
+
+<portlet:defineObjects/>
+
+<h2><fmt:message key="car.common.createGeronimoPlugin"/></h2>
+
+<p><fmt:message key="car.index.createGeronimoPluginExp"/></p>
+
+<form name="<portlet:namespace/>ExportForm" action="<portlet:actionURL/>" method="POST" onsubmit="return <portlet:namespace/>validateForm()">
+ <input type="hidden" name="mode" value="configure-before"/>
+ <select name="configId">
+ <option/>
+ <c:forEach var="config" items="${configurations}">
+ <option>${config.configID}</option>
+ </c:forEach>
+ </select>
+ <input type="submit" value='<fmt:message key="car.common.exportPlugin" />'/>
+</form>
+
+
Propchange: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/createPluginIndex.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/index.jsp Fri Jun 20 14:23:46 2008
@@ -20,24 +20,10 @@
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<fmt:setBundle basename="pluginportlets"/>
-<script>
-function <portlet:namespace/>validateForm(){
- with(document.<portlet:namespace/>ExportForm){
- selected = configId.options[configId.selectedIndex].text;
- if (selected==null || selected=="") {
- alert("<fmt:message key="car.index.validateConfig"/>");
- return false;
- }
- }
- return true;
-}
-</script>
-
<portlet:defineObjects/>
<fmt:message key="car.index.summary"/>
-
<form name="<portlet:namespace/>PluginForm" action="<portlet:actionURL/>">
<input type="hidden" name="mode" value="index-after"/>
<b><fmt:message key="car.common.repository"/>:</b> <%-- todo: entry field for user-specified list --%>
@@ -59,26 +45,3 @@
<br/><input type="submit" value='<fmt:message key="car.common.searchForPlugins" />'/>
</c:if>
</form>
-
-<h2><fmt:message key="car.common.createGeronimoPlugin"/></h2>
-
-<p><fmt:message key="car.index.createGeronimoPluginExp"/></p>
-
-<form name="<portlet:namespace/>ExportForm" action="<portlet:actionURL/>" method="POST" onsubmit="return <portlet:namespace/>validateForm()">
- <input type="hidden" name="mode" value="configure-before"/>
- <select name="configId">
- <option/>
- <c:forEach var="config" items="${configurations}">
- <option>${config.configID}</option>
- </c:forEach>
- </select>
- <input type="submit" value='<fmt:message key="car.common.exportPlugin" />'/>
-</form>
-
-<h2><fmt:message key="car.index.assembleServerLong"/></h2>
-
-<form name="<portlet:namespace/>AssemblyForm" action="<portlet:actionURL/>" method="POST">
- <input type="hidden" name="mode" value="listServer-before"/>
- <input type="submit" value='<fmt:message key="car.index.assembleServer"/>'/>
-</form>
-
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/view/car/pluginParams.jsp Fri Jun 20 14:23:46 2008
@@ -248,7 +248,7 @@
</tr>
<!-- ENTRY FIELD: Prerequisite 3 -->
<tr>
- <th style="min-width: 140px"><div align="right">><fmt:message key="car.common.prerequisite3ID" />:</div></th>
+ <th style="min-width: 140px"><div align="right"><fmt:message key="car.common.prerequisite3ID" />:</div></th>
<td><input name="prereq3" type="text" size="30" value="${prereq3}" /></td>
</tr>
<tr>
@@ -279,13 +279,8 @@
<!-- SUBMIT BUTTON -->
<tr>
<td></td>
- <td><input type="submit" value='<fmt:message key="car.common.savePluginData" />' /></td>
+ <td><input type="submit" value='<fmt:message key="car.common.savePluginData" />' /> <input type="submit" value='<fmt:message key="consolebase.common.cancel" />' onclick="history.go(-1); return false;" /></td>
</tr>
</table>
</form>
<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="index" />
- </portlet:actionURL>"><fmt:message key="consolebase.common.cancel"/></a></p>
\ No newline at end of file
Modified: geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml?rev=670067&r1=670066&r2=670067&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/branches/2.1/plugins/console/plugin-portlets/src/main/webapp/WEB-INF/web.xml Fri Jun 20 14:23:46 2008
@@ -113,6 +113,34 @@
</servlet-mapping>
<servlet>
+ <servlet-name>AssembleServer</servlet-name>
+ <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>portlet-name</param-name>
+ <param-value>AssembleServer</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AssembleServer</servlet-name>
+ <url-pattern>/PlutoInvoker/AssembleServer</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
+ <servlet-name>CreatePlugin</servlet-name>
+ <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+ <init-param>
+ <param-name>portlet-name</param-name>
+ <param-value>CreatePlugin</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>CreatePlugin</servlet-name>
+ <url-pattern>/PlutoInvoker/CreatePlugin</url-pattern>
+ </servlet-mapping>
+
+ <servlet>
<servlet-name>RealmWizard</servlet-name>
<servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
<init-param>