Author: mmao
Date: Mon Aug 27 20:36:05 2007
New Revision: 570298
URL: http://svn.apache.org/viewvc?rev=570298&view=rev
Log:
CXF-887 properties improvements
Thanks Glen for the patch
Modified:
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/Messages.properties
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineStop.java
Modified:
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java?rev=570298&r1=570297&r2=570298&view=diff
==============================================================================
---
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
(original)
+++
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/CXFServiceUnit.java
Mon Aug 27 20:36:05 2007
@@ -97,7 +97,7 @@
try {
ctx.deactivateEndpoint(ref);
} catch (JBIException e) {
- LOG.severe(new Message("SU.FAILED.DEACTIVE.ENDPOINT",
LOG).toString()
+ LOG.severe(new Message("SU.FAILED.DEACTIVATE.ENDPOINT",
LOG).toString()
+ ref + e);
}
} else {
@@ -115,9 +115,9 @@
setDeliveryChannel(ctx.getDeliveryChannel());
ref = ctx.activateEndpoint(getServiceName(),
getEndpointName());
} catch (JBIException e) {
- LOG.severe(new Message("SU.FAIED.ACTIVE.ENDPOINT",
LOG).toString() + e);
+ LOG.severe(new Message("SU.FAILED.ACTIVATE.ENDPOINT",
LOG).toString() + e);
} catch (BusException e) {
- LOG.severe(new Message("SU.FAIED.ACTIVE.ENDPOINT",
LOG).toString() + e);
+ LOG.severe(new Message("SU.FAILED.ACTIVATE.ENDPOINT",
LOG).toString() + e);
}
LOG.info("activated endpoint: " + ref.getEndpointName()
+ " service: " + ref.getServiceName());
Modified:
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/Messages.properties?rev=570298&r1=570297&r2=570298&view=diff
==============================================================================
---
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/Messages.properties
(original)
+++
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/Messages.properties
Mon Aug 27 20:36:05 2007
@@ -21,37 +21,29 @@
BOOTSTRAP.ONUNINSTALL=Bootstrap.onUninstall called
BOOTSTRAP.INIT=Bootstrap.init called
SE.SHUTDOWN=Shutting down CXFServiceEngine
-SE.SET.CONFIGURATION=set CXF configuration to:
-SE.NOT.FOUND.CONFIGURATION=could not find CXF configuration in\t
-SE.INSTALL.ROOT=CXF Service Engine installation root:
-SE.INIT.COMPLETE=CXFServiceEngine init complete
-SE.FAILED.INIT.BUS=failed to initilialize bus
-SE.INIT.BUS=initialising bus
-SE.INIT.BUS.COMPLETE=init bus complete
+SE.FAILED.INIT.BUS=Failed to initialize bus
SE.STARTUP=CXFServiceEngine starting
-SE.STARTUP.COMPLETE=CXFServiceEngine startup complete
SE.STOP=CXFServiceEngine stopped
-SE.FAILED.REGISTER.TRANSPORT.FACTORY=failed to register JBI transport factory
-SE.FAILED.CLASSLOADER=failed to construct component classloader
-SU.FAILED.INIT=failed to initialize service unit
-SU.FAILED.DEACTIVE.ENDPOINT=failed to deactive Endpoint
+SU.FAILED.INIT=Failed to initialize service unit
SU.START.PROVIDER=starting provider
-SU.FAIED.ACTIVE.ENDPOINT=failed to active Endpoint
+
+SU.FAILED.DEACTIVATE.ENDPOINT=Failed to deactivate Endpoint
+SU.FAILED.ACTIVATE.ENDPOINT=Failed to activate Endpoint
+
SU.START.CONSUMER=starting consumer
SU.PUBLISH.ENDPOINT=publishing endpoint
-SU.FAILED.PUBLISH.ENDPOINT=failed to publish endpoint
-SU.COULDNOT.GET.ANNOTATION=could not get WebService annotation from\t
+SU.FAILED.PUBLISH.ENDPOINT=Failed to publish endpoint
+SU.COULDNOT.GET.ANNOTATION=Could not get WebService annotation from\t
SU.MANAGER.SHUTDOWN=SU Manager shutdown\t
-SU.NAME.NULL=service unit name shouldn't be null
-SU.NAME.EMPTY=service unit name shouldn't be empty
-SU.STATE=\tstate is incorrect for shutdown
SU.MANAGER.DEPLOY=SU Manager deploy\t
SU.MANAGER.UNDEPLOY=SU Manager undeploy\t
SU.MANAGER.INIT=SU Manager init\t
SU.MANAGER.START=SU Manager start\t
SU.MANAGER.STOP=SU Manager stop\t
-FAILED.LOAD.CLASS=failed to load class:\t
+SU.NAME.NULL=Service unit name shouldn't be null
+SU.NAME.EMPTY=Service unit name shouldn't be empty
+SU.ROOT.NULL=Service unit root path shouldn't be null
+SU.ROOT.EMPTY=Service unit root path shouldn't be empty
+FAILED.LOAD.CLASS=Failed to load class:\t
DUPLICATED.SU=duplicated SU:\t
-SU.ROOT.NULL=su root path shouldn't be null
-SU.ROOT.EMPTY=su root path shouldn't be empty
-UNDEPLOYED.SU= undeployed SU:\t
+UNDEPLOYED.SU=undeployed SU:\t
Modified:
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties?rev=570298&r1=570297&r2=570298&view=diff
==============================================================================
---
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties
(original)
+++
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/Messages.properties
Mon Aug 27 20:36:05 2007
@@ -16,42 +16,13 @@
# specific language governing permissions and limitations
# under the License.
#
-BOOTSTRAP.CLEANUP=Bootstrap.cleanUp called
-BOOTSTRAP.ONINSTALL=Bootstrap.onInstall called
-BOOTSTRAP.ONUNINSTALL=Bootstrap.onUninstall called
-BOOTSTRAP.INIT=Bootstrap.init called
-SE.SHUTDOWN=Shutting down CXFServiceEngine
-SE.SET.CONFIGURATION=set Apache CXF configuration to:
-SE.NOT.FOUND.CONFIGURATION=could not find Apache CXF configuration in\t
+SE.FAILED.REGISTER.TRANSPORT.FACTORY=Failed to register JBI transport factory
+SE.STARTUP.COMPLETE=CXFServiceEngine startup complete
+SE.SET.CONFIGURATION=Apache CXF configuration set to:
+SE.NOT.FOUND.CONFIGURATION=Could not find Apache CXF configuration in\t
SE.INSTALL.ROOT=Apache CXF Service Engine installation root:
-SE.INIT.COMPLETE=CXFServiceEngine init complete
-SE.FAILED.INIT.BUS=failed to initilialize bus
-SE.INIT.BUS=initialising bus
+SE.INIT.COMPLETE=CXF Service Engine init complete
+SE.INIT.BUS=initializing bus
SE.INIT.BUS.COMPLETE=init bus complete
-SE.STARTUP=CXFServiceEngine starting
-SE.STARTUP.COMPLETE=CXFServiceEngine startup complete
-SE.STOP=CXFServiceEngine stopped
-SE.FAILED.REGISTER.TRANSPORT.FACTORY=failed to register JBI transport factory
-SE.FAILED.CLASSLOADER=failed to construct component classloader
-SU.FAILED.INIT=failed to initialize service unit
-SU.FAILED.DEACTIVE.ENDPOINT=failed to deactive Endpoint
-SU.START.PROVIDER=starting provider
-SU.FAIED.ACTIVE.ENDPOINT=failed to active Endpoint
-SU.START.CONSUMER=starting consumer
-SU.PUBLISH.ENDPOINT=publishing endpoint
-SU.FAILED.PUBLISH.ENDPOINT=failed to publish endpoint
-SU.COULDNOT.GET.ANNOTATION=could not get WebService annotation from\t
-SU.MANAGER.SHUTDOWN=SU Manager shutdown\t
-SU.NAME.NULL=service unit name shouldn't be null
-SU.NAME.EMPTY=service unit name shouldn't be empty
-SU.STATE=\tstate is incorrect for shutdown
-SU.MANAGER.DEPLOY=SU Manager deploy\t
-SU.MANAGER.UNDEPLOY=SU Manager undeploy\t
-SU.MANAGER.INIT=SU Manager init\t
-SU.MANAGER.START=SU Manager start\t
-SU.MANAGER.STOP=SU Manager stop\t
-FAILED.LOAD.CLASS=failed to load class:\t
-DUPLICATED.SU=duplicated SU:\t
-SU.ROOT.NULL=su root path shouldn't be null
-SU.ROOT.EMPTY=su root path shouldn't be empty
-UNDEPLOYED.SU= undeployed SU:\t
+SE.FAILED.INIT.BUS=Failed to initialize bus
+SE.FAILED.CLASSLOADER=Failed to construct component classloader
Modified:
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineStop.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineStop.java?rev=570298&r1=570297&r2=570298&view=diff
==============================================================================
---
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineStop.java
(original)
+++
incubator/cxf/trunk/integration/jbi/src/main/java/org/apache/cxf/jbi/se/state/ServiceEngineStop.java
Mon Aug 27 20:36:05 2007
@@ -25,9 +25,6 @@
import javax.jbi.JBIException;
import javax.jbi.component.ComponentContext;
import javax.jbi.messaging.DeliveryChannel;
-
-
-
import org.apache.cxf.common.i18n.Message;
import org.apache.cxf.common.logging.LogUtils;
//import org.apache.cxf.jbi.se.state.ServiceEngineStateMachine.SEOperation;
