Author: kstam
Date: Tue Nov 9 17:52:37 2010
New Revision: 1033121
URL: http://svn.apache.org/viewvc?rev=1033121&view=rev
Log:
JUDDI-430, switching to use context params instead of initparams
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java
juddi/trunk/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/web.xml
juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java?rev=1033121&r1=1033120&r2=1033121&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/UDDIClerkServlet.java
Tue Nov 9 17:52:37 2010
@@ -31,10 +31,7 @@ public class UDDIClerkServlet extends Ht
private static final long serialVersionUID = -91998529871296125L;
private Logger logger = Logger.getLogger(UDDIClerkServlet.class);
- UDDIClerkManager manager = null;
-
- public static final String UDDI_CLIENT_MANAGER_NAME =
"uddi.client.manager.name";
- public static final String UDDI_CLIENT_CONFIG_FILE =
"uddi.client.config.file";
+ private UDDIClerkManager manager = null;
/**
* Starting the UDDIClerkManager
Modified:
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java?rev=1033121&r1=1033120&r2=1033121&view=diff
==============================================================================
---
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java
(original)
+++
juddi/trunk/juddi-client/src/main/java/org/apache/juddi/v3/client/config/WebHelper.java
Tue Nov 9 17:52:37 2010
@@ -12,36 +12,56 @@ import org.apache.log4j.Logger;
public class WebHelper {
public static Logger logger = Logger.getLogger(WebHelper.class);
- public static String JUDDI_CLIENT_MANAGER_INSTANCE =
"juddi.client.manager.instance";
- public static String JUDDI_CLIENT_HOMENODE_INSTANCE =
"juddi.client.homenode.instance";
- public static String JUDDI_CLIENT_TRANSPORT_INSTANCE =
"juddi.client.transport.instance";
+ public static final String UDDI_CLIENT_MANAGER_NAME =
"uddi.client.manager.name";
+ public static final String UDDI_CLIENT_CONFIG_FILE =
"uddi.client.config.file";
+ public static final String JUDDI_CLIENT_MANAGER_NAME =
"juddi.client.manager.name";
+ public static final String JUDDI_CLIENT_TRANSPORT =
"juddi.client.transport";
/**
- * Checks the servlet context for the manager defined in the web
context, this means
+ * Checks the servlet context for the manager defined in the web
context. Optionally, in your
+ * web.xml you can specify either the manager name if you want to use
an existing manager
+ * called 'uddi-portlet-manager':
+ * <pre>
+ * <context-param>
+ * <param-name>uddi.client.manager.name</param-name>
+ * <param-value>uddi-portlet-manager</param-value>
+ * </context-param>
+ * </pre>
+ * or, if you don't want to use the default META-INF/uddi.xml file
path, but 'META-INF/my-uddi.xml' instead,
+ * then you can set:
+ * <pre>
+ * <context-param>
+ * <param-name>uddi.client.config.path</param-name>
+ * <param-value>META-INF/my-uddi.xml</param-value>
+ * </context-param>
+ * </pre>
* @param servletContext
* @return
* @throws ConfigurationException
*/
public static UDDIClerkManager getUDDIClerkManager(ServletContext
servletContext) throws ConfigurationException
{
- UDDIClerkManager manager = (UDDIClerkManager)
servletContext.getAttribute(JUDDI_CLIENT_MANAGER_INSTANCE);
- if (manager==null) {
- String managerName =
String.valueOf(servletContext.getAttribute(UDDIClerkServlet.UDDI_CLIENT_MANAGER_NAME));
+ if
(servletContext.getAttribute(JUDDI_CLIENT_MANAGER_NAME)!=null) {
+ String managerName =
String.valueOf(servletContext.getAttribute(JUDDI_CLIENT_MANAGER_NAME));
+ return
UDDIClientContainer.getUDDIClerkManager(managerName);
+ } else {
+ String managerName =
servletContext.getInitParameter(UDDI_CLIENT_MANAGER_NAME);
if (managerName!=null) {
try {
- manager =
UDDIClientContainer.getUDDIClerkManager(managerName);
+ UDDIClerkManager manager =
UDDIClientContainer.getUDDIClerkManager(managerName);
logger.info("Manager " + managerName +
" was already started.");
+
servletContext.setAttribute(JUDDI_CLIENT_MANAGER_NAME, managerName);
return manager;
} catch (ConfigurationException ce) {
logger.debug("Manager " + managerName +
" is not yet started.");
}
}
- String clientConfigFile =
servletContext.getInitParameter(UDDIClerkServlet.UDDI_CLIENT_CONFIG_FILE);
+ String clientConfigFile =
servletContext.getInitParameter(UDDI_CLIENT_CONFIG_FILE);
if (clientConfigFile==null) clientConfigFile =
ClientConfig.DEFAULT_UDDI_CONFIG;
logger.info("Reading the managerName from the
clientConfig file " + clientConfigFile);
- manager = new UDDIClerkManager(clientConfigFile);
+ UDDIClerkManager manager = new
UDDIClerkManager(clientConfigFile);
if (clientConfigFile==null && manager.getName()==null) {
logger.warn("Deprecated, manager name set to
'default', however it should be provided in the uddi.xml");
managerName = "default";
@@ -52,10 +72,10 @@ public class WebHelper {
throw new ConfigurationException("A manager
name needs to be specified in the client config file.");
}
manager.start();
-
servletContext.setAttribute(UDDIClerkServlet.UDDI_CLIENT_MANAGER_NAME,
manager.getName());
-
servletContext.setAttribute(JUDDI_CLIENT_MANAGER_INSTANCE, manager);
+ UDDIClientContainer.addClerkManager(manager);
+ servletContext.setAttribute(JUDDI_CLIENT_MANAGER_NAME,
managerName);
+ return manager;
}
- return manager;
}
/**
*
@@ -64,26 +84,21 @@ public class WebHelper {
* @throws ConfigurationException
*/
public static UDDINode getUDDIHomeNode(ServletContext servletContext)
throws ConfigurationException {
- UDDINode homeNode = (UDDINode)
servletContext.getAttribute(JUDDI_CLIENT_HOMENODE_INSTANCE);
- if (homeNode==null) {
- UDDIClerkManager manager =
getUDDIClerkManager(servletContext);
- homeNode = manager.getClientConfig().getHomeNode();
-
servletContext.setAttribute(JUDDI_CLIENT_HOMENODE_INSTANCE, homeNode);
- }
- return homeNode;
+ UDDIClerkManager manager = getUDDIClerkManager(servletContext);
+ return manager.getClientConfig().getHomeNode();
}
public static Transport getTransport(ServletContext servletContext)
throws ConfigurationException, ClassNotFoundException,
IllegalArgumentException,
SecurityException, InstantiationException,
IllegalAccessException, InvocationTargetException, NoSuchMethodException
{
- Transport transport = (Transport)
servletContext.getAttribute(JUDDI_CLIENT_TRANSPORT_INSTANCE);
+ Transport transport = (Transport)
servletContext.getAttribute(JUDDI_CLIENT_TRANSPORT);
if (transport==null) {
UDDIClerkManager manager =
getUDDIClerkManager(servletContext);
- UDDINode node = getUDDIHomeNode(servletContext);
+ UDDINode node = manager.getClientConfig().getHomeNode();
Class<?> transportClass =
ClassUtil.forName(node.getProxyTransport(), Transport.class);
transport = (Transport)
transportClass.getConstructor(String.class,String.class).newInstance(manager.getName(),node.getName());
-
servletContext.setAttribute(JUDDI_CLIENT_TRANSPORT_INSTANCE, transport);
+ servletContext.setAttribute(JUDDI_CLIENT_TRANSPORT,
transport);
}
return transport;
}
@@ -92,12 +107,12 @@ public class WebHelper {
throws ConfigurationException, ClassNotFoundException,
IllegalArgumentException,
SecurityException, InstantiationException, IllegalAccessException,
InvocationTargetException, NoSuchMethodException
{
- Transport transport = (Transport)
servletContext.getAttribute(JUDDI_CLIENT_TRANSPORT_INSTANCE + "-" +
remoteNode.getName());
+ Transport transport = (Transport)
servletContext.getAttribute(JUDDI_CLIENT_TRANSPORT + "-" +
remoteNode.getName());
if (transport==null) {
UDDIClerkManager manager =
getUDDIClerkManager(servletContext);
Class<?> transportClass =
ClassUtil.forName(remoteNode.getProxyTransport(), Transport.class);
transport = (Transport)
transportClass.getConstructor(String.class,String.class).newInstance(manager.getName(),remoteNode.getName());
-
servletContext.setAttribute(JUDDI_CLIENT_TRANSPORT_INSTANCE + "-" +
remoteNode.getName(), transport);
+ servletContext.setAttribute(JUDDI_CLIENT_TRANSPORT +
"-" + remoteNode.getName(), transport);
}
return transport;
}
Modified:
juddi/trunk/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/web.xml?rev=1033121&r1=1033120&r2=1033121&view=diff
==============================================================================
--- juddi/trunk/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/web.xml
(original)
+++ juddi/trunk/juddi-console/uddi-portlets/src/main/webapp/WEB-INF/web.xml Tue
Nov 9 17:52:37 2010
@@ -3,18 +3,20 @@
"http://java.sun.com/dtd/web-app_2_3.dtd"; >
<web-app>
- <display-name>GWT-Maven-Archetype</display-name>
-
+ <display-name>GWT-Maven-Archetype</display-name>
+
+ <!-- only set if you want to use an existing manager, rather then the
one specified in the uddi.xml
+ <context-param>
+ <param-name>uddi.client.manager.name</param-name>
+ <param-value>uddi-portlet-manager</param-value>
+ </context-param>
+ -->
<!-- use to run the registration clerks, make sure the UDDI registry is
up and running before
attempting to run the clerks
-->
<servlet>
<servlet-name>UDDIClerkServlet</servlet-name>
<servlet-class>org.apache.juddi.v3.client.config.UDDIClerkServlet</servlet-class>
- <init-param>
- <param-name>uddi.client.manager.name</param-name>
- <param-value>uddi-portlet-manager</param-value>
- </init-param>
<load-on-startup>1</load-on-startup>
</servlet>
Modified: juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml?rev=1033121&r1=1033120&r2=1033121&view=diff
==============================================================================
--- juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml (original)
+++ juddi/trunk/juddiv3-samples/src/main/webapp/WEB-INF/web.xml Tue Nov 9
17:52:37 2010
@@ -43,10 +43,6 @@
<servlet-name>UDDIClerkServlet</servlet-name>
<display-name>Clerk Servlet</display-name>
<servlet-class>org.apache.juddi.v3.client.config.UDDIClerkServlet</servlet-class>
- <init-param>
- <param-name>uddi.client.manager.name</param-name>
- <param-value>example-manager</param-value>
- </init-param>
<load-on-startup>1</load-on-startup>
</servlet>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
