Author: mattmann
Date: Mon Jul 12 20:34:46 2010
New Revision: 963477
URL: http://svn.apache.org/viewvc?rev=963477&view=rev
Log:
- progress towards OODT-15 One trunk for all OODT components with top level
build
Added:
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogClient.java
- copied, changed from r963466,
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceCommandLineClient.java
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServerLauncher.java
- copied, changed from r963466,
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceServerLauncher.java
Removed:
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceCommandLineClient.java
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceServerLauncher.java
Modified:
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedActionsHandler.java
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedClientsHandler.java
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedServersHandler.java
Copied:
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogClient.java
(from r963466,
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceCommandLineClient.java)
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogClient.java?p2=incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogClient.java&p1=incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceCommandLineClient.java&r1=963466&r2=963477&rev=963477&view=diff
==============================================================================
---
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceCommandLineClient.java
(original)
+++
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogClient.java
Mon Jul 12 20:34:46 2010
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -34,28 +34,34 @@ import org.apache.oodt.cas.commons.optio
import org.apache.oodt.cas.metadata.util.PathUtils;
/**
- * @author bfoster
- * @version $Revision$
- *
- * <p>
- * Client Utility for sending commands to servers
- * <p>
+ *
+ * Cmd-line utility for sending commands to Catalog Servers.
+ *
*/
-public class CatalogServiceCommandLineClient {
+public class CatalogClient {
- public static void main(String[] args) throws Exception {
- String propertiesFile =
System.getProperty("org.apache.oodt.cas.catalog.properties.file");
- if (propertiesFile != null)
- System.getProperties().load(new
FileInputStream(propertiesFile));
- String configFile =
PathUtils.doDynamicReplacement(System.getProperty("org.apache.oodt.cas.catalog.client.config.file",
"classpath:/org.apache/oodt/cas/catalog/config/catserv-client-config.xml"));
- FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(new String[] { configFile }, false);
-// appContext.setClassLoader(new Serializer().getClassLoader());
- appContext.refresh();
- List<CmdLineOptionInstance> optionInstances =
CmdLineOptionUtils.loadValidateAndHandleInstances(appContext, args);
- CmdLineOptionInstance instance =
CmdLineOptionUtils.getOptionInstanceByName("clientFactoryBeanId",
optionInstances);
- CatalogServiceClientFactory csClientFactory =
(CatalogServiceClientFactory) appContext.getBean(instance.getValues().get(0),
CatalogServiceClientFactory.class);
- CatalogServiceClient csClient =
csClientFactory.createCatalogService();
- instance = CmdLineOptionUtils.getOptionInstanceByName("action",
optionInstances);
- ((CatalogServiceServerAction)
appContext.getBean(instance.getValues().get(0),
CatalogServiceServerAction.class)).performAction(csClient);
- }
+ public static void main(String[] args) throws Exception {
+ String propertiesFile = System
+ .getProperty("org.apache.oodt.cas.catalog.properties.file");
+ if (propertiesFile != null)
+ System.getProperties().load(new FileInputStream(propertiesFile));
+ String configFile = PathUtils
+ .doDynamicReplacement(System
+ .getProperty("org.apache.oodt.cas.catalog.client.config.file",
+
"classpath:/org.apache/oodt/cas/catalog/config/catserv-client-config.xml"));
+ FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(
+ new String[] { configFile }, false);
+ appContext.refresh();
+ List<CmdLineOptionInstance> optionInstances = CmdLineOptionUtils
+ .loadValidateAndHandleInstances(appContext, args);
+ CmdLineOptionInstance instance = CmdLineOptionUtils
+ .getOptionInstanceByName("clientFactoryBeanId", optionInstances);
+ CatalogServiceClientFactory csClientFactory =
(CatalogServiceClientFactory) appContext
+ .getBean(instance.getValues().get(0),
CatalogServiceClientFactory.class);
+ CatalogServiceClient csClient = csClientFactory.createCatalogService();
+ instance = CmdLineOptionUtils.getOptionInstanceByName("action",
+ optionInstances);
+ ((CatalogServiceServerAction) appContext.getBean(instance.getValues()
+ .get(0), CatalogServiceServerAction.class)).performAction(csClient);
+ }
}
Copied:
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServerLauncher.java
(from r963466,
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceServerLauncher.java)
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServerLauncher.java?p2=incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServerLauncher.java&p1=incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceServerLauncher.java&r1=963466&r2=963477&rev=963477&view=diff
==============================================================================
---
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServiceServerLauncher.java
(original)
+++
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/CatalogServerLauncher.java
Mon Jul 12 20:34:46 2010
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -35,60 +35,42 @@ import org.apache.oodt.cas.metadata.util
import org.springframework.context.support.FileSystemXmlApplicationContext;
/**
- * @author bfoster
- * @version $Revision$
- *
- * <p>
- * Utility for launching CommunicationChannelServers
- * <p>
+ *
+ * Utility for launching servers.
+ *
*/
-public class CatalogServiceServerLauncher {
-
- private CatalogServiceServerLauncher() throws InstantiationException {}
-//
-// public static void startup(String beanId) throws Exception {
-// String propertiesFile =
System.getProperty("org.apache.oodt.cas.catalog.properties.file");
-// if (propertiesFile != null)
-// System.getProperties().load(new
FileInputStream(propertiesFile));
-// FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(PathUtils.doDynamicReplacement(System.getProperty("org.apache.oodt.cas.catalog.config.file",
"classpath:/org.apache/oodt/cas/catalog/config/catserv-config.xml")));
-// CommunicationChannelServerFactory serverFactory =
(CommunicationChannelServerFactory) appContext.getBean(beanId,
CommunicationChannelServerFactory.class);
-// CommunicationChannelServer communicationChannelServer =
serverFactory.createCommunicationChannelServer();
-// communicationChannelServer.startup();
-// System.out.println("\n---- Launched '" +
communicationChannelServer.getClass().getCanonicalName() + "' on port: " +
communicationChannelServer.getPort() + " ----");
-// }
-
- public static void main(String[] args) throws Exception {
- String propertiesFile =
System.getProperty("org.apache.oodt.cas.catalog.properties.file");
- if (propertiesFile != null)
- System.getProperties().load(new
FileInputStream(propertiesFile));
- String configFile =
PathUtils.doDynamicReplacement(System.getProperty("org.apache.oodt.cas.catalog.server.config.file",
"classpath:/org.apache/oodt/cas/catalog/config/catserv-server-config.xml"));
- FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(new String[] { configFile }, false);
- appContext.setClassLoader(new Serializer().getClassLoader());
- appContext.refresh();
- List<CmdLineOptionInstance> optionInstances =
CmdLineOptionUtils.loadValidateAndHandleInstances(appContext, args);
- CmdLineOptionInstance instance =
CmdLineOptionUtils.getOptionInstanceByName("serverFactoryBeanId",
optionInstances);
- CommunicationChannelServerFactory serverFactory =
(CommunicationChannelServerFactory)
appContext.getBean(instance.getValues().get(0),
CommunicationChannelServerFactory.class);
- CommunicationChannelServer communicationChannelServer =
serverFactory.createCommunicationChannelServer();
- communicationChannelServer.startup();
- System.out.println("\n---- Launched '" +
communicationChannelServer.getClass().getCanonicalName() + "' on port: " +
communicationChannelServer.getPort() + " ----");
-
-//
-//
-//
-// String beanId = null;
-// for (int i = 0; i < args.length; i++) {
-// if (args[i].equals("--serverFactoryBeanId"))
-// beanId = args[++i];
-// }
-//
-// if (beanId == null) {
-// System.out.println("Usage: " +
CatalogServiceServerLauncher.class.getName() + "\n"
-// + " --serverFactoryBeanId <bean-id>
\n");
-// System.exit(1);
-// }
-//
-// CatalogServiceServerLauncher.startup(beanId);
-
- }
+public class CatalogServerLauncher {
+
+ private CatalogServerLauncher() throws InstantiationException {
+ }
+
+ public static void main(String[] args) throws Exception {
+ String propertiesFile = System
+ .getProperty("org.apache.oodt.cas.catalog.properties.file");
+ if (propertiesFile != null)
+ System.getProperties().load(new FileInputStream(propertiesFile));
+ String configFile = PathUtils
+ .doDynamicReplacement(System
+ .getProperty("org.apache.oodt.cas.catalog.server.config.file",
+
"classpath:/org.apache/oodt/cas/catalog/config/catserv-server-config.xml"));
+ FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(
+ new String[] { configFile }, false);
+ appContext.setClassLoader(new Serializer().getClassLoader());
+ appContext.refresh();
+ List<CmdLineOptionInstance> optionInstances = CmdLineOptionUtils
+ .loadValidateAndHandleInstances(appContext, args);
+ CmdLineOptionInstance instance = CmdLineOptionUtils
+ .getOptionInstanceByName("serverFactoryBeanId", optionInstances);
+ CommunicationChannelServerFactory serverFactory =
(CommunicationChannelServerFactory) appContext
+ .getBean(instance.getValues().get(0),
+ CommunicationChannelServerFactory.class);
+ CommunicationChannelServer communicationChannelServer = serverFactory
+ .createCommunicationChannelServer();
+ communicationChannelServer.startup();
+ System.out.println("\n---- Launched '"
+ + communicationChannelServer.getClass().getCanonicalName()
+ + "' on port: " + communicationChannelServer.getPort() + " ----");
+
+ }
}
Modified:
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedActionsHandler.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedActionsHandler.java?rev=963477&r1=963476&r2=963477&view=diff
==============================================================================
---
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedActionsHandler.java
(original)
+++
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedActionsHandler.java
Mon Jul 12 20:34:46 2010
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -17,44 +17,54 @@
package org.apache.oodt.cas.catalog.server.option;
+//JDK imports
import java.io.PrintStream;
import java.util.List;
import java.util.Map;
+//Spring imports
import org.springframework.context.support.FileSystemXmlApplicationContext;
+//OODT imports
import org.apache.oodt.cas.catalog.server.action.CatalogServiceServerAction;
import org.apache.oodt.cas.catalog.util.Serializer;
import org.apache.oodt.cas.commons.option.CmdLineOption;
import org.apache.oodt.cas.commons.option.handler.CmdLineOptionHandler;
+/**
+ *
+ * Describe your class here.
+ *
+ */
public class PrintSupportedActionsHandler extends CmdLineOptionHandler {
- protected String beanRepo;
-
- @Override
- public String getCustomOptionUsage(CmdLineOption option) {
- return "";
- }
-
- @Override
- public void handleOption(CmdLineOption option, List<String> values) {
- FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(new String[] { this.beanRepo }, false);
- appContext.setClassLoader(new Serializer().getClassLoader());
- appContext.refresh();
- PrintStream ps = new PrintStream(System.out);
- ps.println("Actions:");
- for (CatalogServiceServerAction action : ((Map<String,
CatalogServiceServerAction>)
appContext.getBeansOfType(CatalogServiceServerAction.class)).values()) {
- ps.println(" Action:");
- ps.println(" Id: " + action.getId());
- ps.println(" Description: " + action.getDescription());
- ps.println();
- }
- ps.close();
- }
-
- public void setBeanRepo(String beanRepo) {
- this.beanRepo = beanRepo;
- }
-
+ protected String beanRepo;
+
+ @Override
+ public String getCustomOptionUsage(CmdLineOption option) {
+ return "";
+ }
+
+ @Override
+ public void handleOption(CmdLineOption option, List<String> values) {
+ FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(
+ new String[] { this.beanRepo }, false);
+ appContext.setClassLoader(new Serializer().getClassLoader());
+ appContext.refresh();
+ PrintStream ps = new PrintStream(System.out);
+ ps.println("Actions:");
+ for (CatalogServiceServerAction action : ((Map<String,
CatalogServiceServerAction>) appContext
+ .getBeansOfType(CatalogServiceServerAction.class)).values()) {
+ ps.println(" Action:");
+ ps.println(" Id: " + action.getId());
+ ps.println(" Description: " + action.getDescription());
+ ps.println();
+ }
+ ps.close();
+ }
+
+ public void setBeanRepo(String beanRepo) {
+ this.beanRepo = beanRepo;
+ }
+
}
Modified:
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedClientsHandler.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedClientsHandler.java?rev=963477&r1=963476&r2=963477&view=diff
==============================================================================
---
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedClientsHandler.java
(original)
+++
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedClientsHandler.java
Mon Jul 12 20:34:46 2010
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -17,45 +17,56 @@
package org.apache.oodt.cas.catalog.server.option;
+//JDK imports
import java.io.PrintStream;
import java.util.List;
+//Spring imports
import org.springframework.context.support.FileSystemXmlApplicationContext;
+//OODT imports
import org.apache.oodt.cas.catalog.util.Serializer;
-import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClient;
-import org.apache.oodt.cas.catalog.system.impl.CatalogServiceClientFactory;
+import org.apache.oodt.cas.catalog.system.XmlRpcCatalogClient;
+import org.apache.oodt.cas.catalog.system.XmlRpcCatalogServer;
import org.apache.oodt.cas.commons.option.CmdLineOption;
import org.apache.oodt.cas.commons.option.handler.CmdLineOptionHandler;
+/**
+ *
+ * Describe your class here.
+ *
+ */
public class PrintSupportedClientsHandler extends CmdLineOptionHandler {
- protected String beanRepo;
-
- @Override
- public String getCustomOptionUsage(CmdLineOption option) {
- return "";
- }
-
- @Override
- public void handleOption(CmdLineOption option, List<String> values) {
- FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(new String[] { this.beanRepo }, false);
- appContext.setClassLoader(new Serializer().getClassLoader());
- appContext.refresh();
- PrintStream ps = new PrintStream(System.out);
- ps.println("ClientFactories:");
- for (String clientId :
appContext.getBeanNamesForType(CatalogServiceClientFactory.class)) {
- CatalogServiceClientFactory clientFactory =
(CatalogServiceClientFactory) appContext.getBean(clientId,
CatalogServiceClientFactory.class);
- ps.println(" ClientFactory:");
- ps.println(" Id: " + clientId);
- ps.println(" URL: " + clientFactory.getServerUrl());
- ps.println();
- }
- ps.close();
- }
-
- public void setBeanRepo(String beanRepo) {
- this.beanRepo = beanRepo;
- }
-
+ protected String beanRepo;
+
+ @Override
+ public String getCustomOptionUsage(CmdLineOption option) {
+ return "";
+ }
+
+ @Override
+ public void handleOption(CmdLineOption option, List<String> values) {
+ FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(
+ new String[] { this.beanRepo }, false);
+ appContext.setClassLoader(new Serializer().getClassLoader());
+ appContext.refresh();
+ PrintStream ps = new PrintStream(System.out);
+ ps.println("ClientFactories:");
+ for (String clientId : appContext
+ .getBeanNamesForType(CatalogServiceClientFactory.class)) {
+ CatalogServiceClientFactory clientFactory =
(CatalogServiceClientFactory) appContext
+ .getBean(clientId, CatalogServiceClientFactory.class);
+ ps.println(" ClientFactory:");
+ ps.println(" Id: " + clientId);
+ ps.println(" URL: " + clientFactory.getServerUrl());
+ ps.println();
+ }
+ ps.close();
+ }
+
+ public void setBeanRepo(String beanRepo) {
+ this.beanRepo = beanRepo;
+ }
+
}
Modified:
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedServersHandler.java
URL:
http://svn.apache.org/viewvc/incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedServersHandler.java?rev=963477&r1=963476&r2=963477&view=diff
==============================================================================
---
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedServersHandler.java
(original)
+++
incubator/oodt/trunk/catalog/src/main/java/org/apache/oodt/cas/catalog/cmdline/PrintSupportedServersHandler.java
Mon Jul 12 20:34:46 2010
@@ -1,4 +1,4 @@
-/*
+/**
* 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.
@@ -17,44 +17,55 @@
package org.apache.oodt.cas.catalog.server.option;
+//JDK imports
import java.io.PrintStream;
import java.util.List;
+//Spring imports
import org.springframework.context.support.FileSystemXmlApplicationContext;
+//OODT imports
import org.apache.oodt.cas.catalog.util.Serializer;
import
org.apache.oodt.cas.catalog.server.channel.CommunicationChannelServerFactory;
import org.apache.oodt.cas.commons.option.CmdLineOption;
import org.apache.oodt.cas.commons.option.handler.CmdLineOptionHandler;
+/**
+ *
+ * Describe your class here.
+ *
+ */
public class PrintSupportedServersHandler extends CmdLineOptionHandler {
- protected String beanRepo;
-
- @Override
- public String getCustomOptionUsage(CmdLineOption option) {
- return "";
- }
-
- @Override
- public void handleOption(CmdLineOption option, List<String> values) {
- FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(new String[] { this.beanRepo }, false);
- appContext.setClassLoader(new Serializer().getClassLoader());
- appContext.refresh();
- PrintStream ps = new PrintStream(System.out);
- ps.println("ServerFactories:");
- for (String serverId :
appContext.getBeanNamesForType(CommunicationChannelServerFactory.class)) {
- CommunicationChannelServerFactory serverFactory =
(CommunicationChannelServerFactory) appContext.getBean(serverId,
CommunicationChannelServerFactory.class);
- ps.println(" ServerFactory:");
- ps.println(" Id: " + serverId);
- ps.println(" Port: " + serverFactory.getPort());
- ps.println();
- }
- ps.close();
- }
-
- public void setBeanRepo(String beanRepo) {
- this.beanRepo = beanRepo;
- }
-
+ protected String beanRepo;
+
+ @Override
+ public String getCustomOptionUsage(CmdLineOption option) {
+ return "";
+ }
+
+ @Override
+ public void handleOption(CmdLineOption option, List<String> values) {
+ FileSystemXmlApplicationContext appContext = new
FileSystemXmlApplicationContext(
+ new String[] { this.beanRepo }, false);
+ appContext.setClassLoader(new Serializer().getClassLoader());
+ appContext.refresh();
+ PrintStream ps = new PrintStream(System.out);
+ ps.println("ServerFactories:");
+ for (String serverId : appContext
+ .getBeanNamesForType(CommunicationChannelServerFactory.class)) {
+ CommunicationChannelServerFactory serverFactory =
(CommunicationChannelServerFactory) appContext
+ .getBean(serverId, CommunicationChannelServerFactory.class);
+ ps.println(" ServerFactory:");
+ ps.println(" Id: " + serverId);
+ ps.println(" Port: " + serverFactory.getPort());
+ ps.println();
+ }
+ ps.close();
+ }
+
+ public void setBeanRepo(String beanRepo) {
+ this.beanRepo = beanRepo;
+ }
+
}
