You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/04/28 07:23:07 UTC
svn commit: r652065 - in /incubator/tuscany/java/sca/modules:
domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/
implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/
node2-launcher/src/mai...
Author: jsdelfino
Date: Sun Apr 27 22:23:06 2008
New Revision: 652065
URL: http://svn.apache.org/viewvc?rev=652065&view=rev
Log:
Adjusted log levels to make the manager app less verbose.
Modified:
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java
incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/CompositeConfigurationCollectionImpl.java Sun Apr 27 22:23:06 2008
@@ -92,7 +92,7 @@
}
public Entry<String, Item>[] query(String queryString) {
- logger.info("query " + queryString);
+ logger.fine("query " + queryString);
if (queryString.startsWith("composite=")) {
@@ -138,7 +138,7 @@
// Get the request path
String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
String key = path.startsWith("/")? path.substring(1) : path;
- logger.info("get " + key);
+ logger.fine("get " + key);
// The key contains a node name, redirect
// to the corresponding composite config
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/ContributionCollectionImpl.java Sun Apr 27 22:23:06 2008
@@ -178,7 +178,7 @@
}
public Entry<String, Item>[] getAll() {
- logger.info("getAll");
+ logger.fine("getAll");
// Return all the contributions
List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
@@ -194,7 +194,7 @@
}
public Item get(String key) throws NotFoundException {
- logger.info("get " + key);
+ logger.fine("get " + key);
// Returns the contribution with the given URI key
Workspace workspace = readContributions(readWorkspace());
@@ -214,7 +214,7 @@
// The key is the contribution URI
String key = path.startsWith("/")? path.substring(1) : path;
- logger.info("get " + key);
+ logger.fine("get " + key);
// Get the item describing the composite
Item item;
@@ -230,7 +230,7 @@
}
public String post(String key, Item item) {
- logger.info("post " + key);
+ logger.fine("post " + key);
// Adds a new contribution to the workspace
Workspace workspace = readWorkspace();
@@ -274,7 +274,7 @@
}
public void delete(String key) throws NotFoundException {
- logger.info("delete " + key);
+ logger.fine("delete " + key);
// Delete a contribution from the workspace
Workspace workspace = readWorkspace();
@@ -292,7 +292,7 @@
}
public Entry<String, Item>[] query(String queryString) {
- logger.info("query " + queryString);
+ logger.fine("query " + queryString);
if (queryString.startsWith("dependencies=") || queryString.startsWith("alldependencies=")) {
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployableCompositeCollectionImpl.java Sun Apr 27 22:23:06 2008
@@ -71,6 +71,7 @@
import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
import org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
import org.apache.tuscany.sca.contribution.service.ContributionReadException;
@@ -187,7 +188,7 @@
}
public Entry<String, Item>[] getAll() {
- logger.info("getAll");
+ logger.fine("getAll");
// Return all the deployable composites in the contributions
List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
@@ -215,7 +216,7 @@
}
public Item get(String key) throws NotFoundException {
- logger.info("get " + key);
+ logger.fine("get " + key);
// Get the specified contribution info
String contributionURI = contributionURI(key);
@@ -258,7 +259,7 @@
}
public Entry<String, Item>[] query(String queryString) {
- logger.info("query " + queryString);
+ logger.fine("query " + queryString);
if (queryString.startsWith("contribution=")) {
@@ -301,7 +302,7 @@
// Get the request path
String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
String key = path.startsWith("/")? path.substring(1) : path;
- logger.info("get " + key);
+ logger.fine("get " + key);
// Expect a key in the form
// composite:contributionURI;namespace;localName
@@ -570,12 +571,14 @@
URL location = locationURL(contributionLocation);
Contribution contribution = (Contribution)contributionContentProcessor.read(null, uri, location);
- //contributionContentProcessor.resolve(contribution, new DefaultModelResolver());
+ contributionContentProcessor.resolve(contribution, new DefaultModelResolver());
return contribution;
} catch (ContributionReadException e) {
throw e;
} catch (MalformedURLException e) {
+ throw new ContributionReadException(e);
+ } catch (ContributionResolveException e) {
throw new ContributionReadException(e);
}
}
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/DeployedCompositeCollectionImpl.java Sun Apr 27 22:23:06 2008
@@ -132,7 +132,7 @@
}
public Entry<String, Item>[] getAll() {
- logger.info("getAll");
+ logger.fine("getAll");
// Return all the composites in the domain composite
List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
@@ -159,7 +159,7 @@
}
public Item get(String key) throws NotFoundException {
- logger.info("get " + key);
+ logger.fine("get " + key);
String contributionURI = contributionURI(key);
QName qname = compositeQName(key);
@@ -185,7 +185,7 @@
// Get the request path
String path = URLDecoder.decode(request.getRequestURI().substring(request.getServletPath().length()), "UTF-8");
String key = path.startsWith("/")? path.substring(1) : path;
- logger.info("get " + key);
+ logger.fine("get " + key);
// Get the item describing the composite
Item item;
@@ -228,7 +228,7 @@
}
public String post(String key, Item item) {
- logger.info("post " + key);
+ logger.fine("post " + key);
String contributionURI = contributionURI(key);
QName qname = compositeQName(key);
@@ -267,7 +267,7 @@
}
public void put(String key, Item item) throws NotFoundException {
- logger.info("put " + key);
+ logger.fine("put " + key);
String contributionURI = contributionURI(key);
QName qname = compositeQName(key);
@@ -294,7 +294,7 @@
}
public void delete(String key) throws NotFoundException {
- logger.info("delete " + key);
+ logger.fine("delete " + key);
String contributionURI = contributionURI(key);
QName qname = compositeQName(key);
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileCollectionImpl.java Sun Apr 27 22:23:06 2008
@@ -56,7 +56,7 @@
}
public Entry<String, Item>[] getAll() {
- logger.info("getAll");
+ logger.fine("getAll");
// Return all the files
List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
@@ -73,7 +73,7 @@
}
public Item get(String key) throws NotFoundException {
- logger.info("get " + key);
+ logger.fine("get " + key);
return item(key);
}
@@ -86,7 +86,7 @@
}
public void delete(String key) throws NotFoundException {
- logger.info("delete " + key);
+ logger.fine("delete " + key);
File directory = new File(directoryName);
File file = new File(directory, key);
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/FileServiceImpl.java Sun Apr 27 22:23:06 2008
@@ -80,7 +80,7 @@
if (!directory.exists()) {
directory.mkdirs();
}
- logger.info("post " + item.getName());
+ logger.fine("post " + item.getName());
item.write(new File(directory, item.getName()));
}
}
@@ -102,7 +102,7 @@
if (path.startsWith("/")) {
path = path.substring(1);
}
- logger.info("get " + path);
+ logger.fine("get " + path);
try {
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/NodeProcessCollectionFacadeImpl.java Sun Apr 27 22:23:06 2008
@@ -88,7 +88,7 @@
}
public Entry<String, Item>[] getAll() {
- logger.info("getAll");
+ logger.fine("getAll");
// Get the collection of nodes
Entry<String, Item>[] nodeEntries = cloudCollection.getAll();
@@ -107,7 +107,7 @@
}
public Item get(String key) throws NotFoundException {
- logger.info("get " + key);
+ logger.fine("get " + key);
// Get the host hosting the given node
String host = host(key);
@@ -118,7 +118,7 @@
}
public String post(String key, Item item) {
- logger.info("post " + key);
+ logger.fine("post " + key);
// Get the host hosting the given node
String host;
@@ -138,7 +138,7 @@
}
public void delete(String key) throws NotFoundException {
- logger.info("delete " + key);
+ logger.fine("delete " + key);
// Get the host hosting the given node
String host = host(key);
@@ -149,7 +149,7 @@
}
public Entry<String, Item>[] query(String queryString) {
- logger.info("query " + queryString);
+ logger.fine("query " + queryString);
if (queryString.startsWith("node=")) {
String key = queryString.substring(queryString.indexOf('=') + 1);
Modified: incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/domain-manager/src/main/java/org/apache/tuscany/sca/domain/manager/impl/QuickStartServiceImpl.java Sun Apr 27 22:23:06 2008
@@ -100,10 +100,10 @@
String compositeURI = request.getParameter("composite");
String start = request.getParameter("start");
- logger.info("Composite Quick Start.");
- logger.info("Contribution URI: " + contributionURI);
- logger.info("Contribution location: " + contributionLocation);
- logger.info("Composite URI: " + compositeURI);
+ logger.fine("Composite Quick Start.");
+ logger.fine("Contribution URI: " + contributionURI);
+ logger.fine("Contribution location: " + contributionLocation);
+ logger.fine("Composite URI: " + compositeURI);
// Look for the contribution in the workspace
Entry<String, Item>[] contributionEntries = contributionCollection.getAll();
Modified: incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java Sun Apr 27 22:23:06 2008
@@ -59,7 +59,7 @@
}
public Entry<String, Item>[] getAll() {
- logger.info("getAll");
+ logger.fine("getAll");
// Return all the running VMs
List<Entry<String, Item>> entries = new ArrayList<Entry<String, Item>>();
@@ -70,7 +70,7 @@
}
public Item get(String key) throws NotFoundException {
- logger.info("get " + key);
+ logger.fine("get " + key);
// Return the specified VM
SCANodeVM vm = vm(key);
@@ -82,7 +82,7 @@
}
public String post(String key, Item item) {
- logger.info("post " + key);
+ logger.fine("post " + key);
// If the VM is already running just return it
SCANodeVM vm = vm(key);
@@ -117,7 +117,7 @@
}
public void delete(String key) throws NotFoundException {
- logger.info("delete " + key);
+ logger.fine("delete " + key);
// Stop a VM and remove it from the collection
SCANodeVM vm = vm(key);
@@ -134,7 +134,7 @@
}
public Entry<String, Item>[] query(String queryString) {
- logger.info("query " + queryString);
+ logger.fine("query " + queryString);
if (queryString.startsWith("node=")) {
Modified: incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/PingServiceImpl.java Sun Apr 27 22:23:06 2008
@@ -54,7 +54,7 @@
@Override
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- logger.info("ping");
+ logger.fine("ping");
response.getWriter().print("<html><body><span id=\"ping\">OK</span></body></html>");
}
Modified: incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java?rev=652065&r1=652064&r2=652065&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java (original)
+++ incubator/tuscany/java/sca/modules/node2-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java Sun Apr 27 22:23:06 2008
@@ -142,7 +142,7 @@
home = System.getenv(TUSCANY_HOME);
}
if (home != null && home.length() != 0) {
- logger.info(TUSCANY_HOME + ": " + home);
+ logger.fine(TUSCANY_HOME + ": " + home);
File homeDirectory = new File(home);
if (homeDirectory.exists()) {
@@ -197,7 +197,7 @@
}
}
if (count != 0) {
- logger.info("Runtime classpath: "+ count + " JAR" + (count > 1? "s":"")+ " from " + directory.toString());
+ logger.fine("Runtime classpath: "+ count + " JAR" + (count > 1? "s":"")+ " from " + directory.toString());
}
}
}