Repository: servicemix-features Updated Branches: refs/heads/master b081df71b -> 7b1d89880
http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java ---------------------------------------------------------------------- diff --git a/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java b/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java deleted file mode 100644 index eace50b..0000000 --- a/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/DefaultLoggingEventFormat.java +++ /dev/null @@ -1,70 +0,0 @@ -/** - * 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.servicemix.logging.jms; - -import org.ops4j.pax.logging.spi.PaxLoggingEvent; - -import java.text.SimpleDateFormat; -import java.util.Date; - -/** - * Default event logging format for the JMS appender - */ -public class DefaultLoggingEventFormat implements LoggingEventFormat { - - private SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ"); - - public String toString(PaxLoggingEvent paxLoggingEvent) { - StringBuilder writer = new StringBuilder(); - - writer.append("Error"); - writer.append(",\n \"timestamp\" : " + formatDate(paxLoggingEvent.getTimeStamp())); - writer.append(",\n \"level\" : " + paxLoggingEvent.getLevel().toString()); - writer.append(",\n \"logger\" : " + paxLoggingEvent.getLoggerName()); - writer.append(",\n \"thread\" : " + paxLoggingEvent.getThreadName()); - writer.append(",\n \"message\" : " + paxLoggingEvent.getMessage()); - - String[] throwable = paxLoggingEvent.getThrowableStrRep(); - if (throwable != null) { - writer.append(",\n \"exception\" : ["); - for (int i = 0; i < throwable.length; i++) { - if (i != 0) - writer.append(", " + throwable[i]); - } - writer.append("]"); - } - - writer.append(",\n \"properties\" : { "); - boolean first = true; - for (Object key : paxLoggingEvent.getProperties().keySet()) { - if (first) { - first = false; - } else { - writer.append(", "); - } - writer.append("key : " + key.toString()); - writer.append(": " + paxLoggingEvent.getProperties().get(key).toString()); - } - writer.append(" }"); - writer.append("\n}"); - return writer.toString(); - } - - private String formatDate(long timestamp) { - return simpleDateFormat.format(new Date(timestamp)); - } -} http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java ---------------------------------------------------------------------- diff --git a/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java b/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java deleted file mode 100644 index ccc2006..0000000 --- a/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/JMSAppender.java +++ /dev/null @@ -1,121 +0,0 @@ -/** - * 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.servicemix.logging.jms; - -import org.ops4j.pax.logging.spi.PaxAppender; -import org.ops4j.pax.logging.spi.PaxLoggingEvent; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.jms.*; - -public class JMSAppender implements PaxAppender { - - private static final transient Logger LOG = LoggerFactory.getLogger(JMSAppender.class); - - private static final String DEFAULT_EVENT_FORMAT = "default"; - private static final String LOGSTASH_EVENT_FORMAT = "logstash"; - - - private ConnectionFactory jmsConnectionFactory; - private Connection connection; - private Session session; - private MessageProducer producer; - private String destinationName; - - private LoggingEventFormat format = new DefaultLoggingEventFormat(); - - public void close() { - closeJMSResources(); - } - - public void doAppend(PaxLoggingEvent paxLoggingEvent) { - try { - // Send message to the destination - TextMessage message = getOrCreateSession().createTextMessage(); - message.setText(format.toString(paxLoggingEvent)); - getOrCreatePublisher().send(message); - } catch (JMSException e) { - LOG.warn("Exception caught while sending log event - reinitializing JMS resources to recover", e); - closeJMSResources(); - - } - } - - public void setJmsConnectionFactory(ConnectionFactory jmsConnectionFactory) { - this.jmsConnectionFactory = jmsConnectionFactory; - } - - public void setDestinationName(String destinationName) { - this.destinationName = destinationName; - } - - public void setFormat(String name) { - if (LOGSTASH_EVENT_FORMAT.equals(name)) { - format = new LogstashEventFormat(); - } else { - format = new DefaultLoggingEventFormat(); - } - } - - protected Connection getOrCreateConnection() throws JMSException { - if (connection == null) { - connection = jmsConnectionFactory.createConnection(); - } - return connection; - } - - protected Session getOrCreateSession() throws JMSException { - if (session == null) { - session = getOrCreateConnection().createSession(false, Session.AUTO_ACKNOWLEDGE); - } - return session; - } - - protected MessageProducer getOrCreatePublisher() throws JMSException { - if (producer == null) { - Destination topic = session.createTopic(destinationName); - producer = session.createProducer(topic); - producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT); - } - - return producer; - } - - private void closeJMSResources() { - try { - if (producer != null) { - producer.close(); - producer = null; - } - if (session != null) { - session.close(); - session = null; - } - if (connection != null) { - connection.close(); - connection = null; - } - } catch (JMSException e) { - LOG.debug("Exception caught while closing JMS resources", e); - // let's just set all the fields to null so stuff will be re-created - producer = null; - session = null; - connection = null; - } - } -} http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java ---------------------------------------------------------------------- diff --git a/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java b/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java deleted file mode 100644 index 761e4b9..0000000 --- a/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LoggingEventFormat.java +++ /dev/null @@ -1,28 +0,0 @@ -/** - * 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.servicemix.logging.jms; - -import org.ops4j.pax.logging.spi.PaxLoggingEvent; - -/** - * Interface to represent an event message format, used for serializing log events into JMS messages - */ -public interface LoggingEventFormat { - - public String toString(PaxLoggingEvent event); - -} http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java ---------------------------------------------------------------------- diff --git a/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java b/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java deleted file mode 100644 index b9af5be..0000000 --- a/logging/jms-appender/src/main/java/org/apache/servicemix/logging/jms/LogstashEventFormat.java +++ /dev/null @@ -1,68 +0,0 @@ -/** - * 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.servicemix.logging.jms; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; -import org.ops4j.pax.logging.spi.PaxLoggingEvent; - -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; - -/** - * Creates a log message in Logstash' internal message format, - * cfr. https://github.com/logstash/logstash/wiki/logstash's-internal-message-format - */ -public class LogstashEventFormat implements LoggingEventFormat { - - protected static final DateFormat TIMESTAMP_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); - - protected static final String FIELDS = "@fields"; - protected static final String MESSAGE = "@message"; - protected static final String SOURCE = "@source"; - protected static final String TAGS = "@tags"; - protected static final String TIMESTAMP = "@timestamp"; - - public String toString(PaxLoggingEvent event) { - JSONObject object = new JSONObject(); - try { - object.put(MESSAGE, event.getMessage()); - object.put(SOURCE, event.getLoggerName()); - object.put(TIMESTAMP, TIMESTAMP_FORMAT.format(new Date(event.getTimeStamp()))); - - JSONObject fields = new JSONObject(); - for (Object property : event.getProperties().entrySet()) { - Map.Entry<String, Object> entry = (Map.Entry<String, Object>) property; - fields.put(entry.getKey(), entry.getValue().toString()); - } - - object.put(FIELDS, fields); - - JSONArray tags = new JSONArray(); - tags.put(event.getLevel().toString()); - object.put(TAGS, tags); - } catch (JSONException e) { - // let's return a minimal, String-based message representation instead - return "{ \"" + MESSAGE + "\" : " + event.getMessage() + "}"; - } - return object.toString(); - } - -} http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml ---------------------------------------------------------------------- diff --git a/logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml b/logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml deleted file mode 100644 index eb126db..0000000 --- a/logging/jms-appender/src/main/resources/OSGI-INF/blueprint/config.xml +++ /dev/null @@ -1,45 +0,0 @@ -<!-- - - 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. - ---> -<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; - xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"; - xmlns:ext="http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0";> - - <cm:property-placeholder persistent-id="org.apache.servicemix.logging.jms" update-strategy="reload"> - <cm:default-properties> - <cm:property name="destinationName" value="Logging.Events"/> - <cm:property name="format" value="default"/> - </cm:default-properties> - </cm:property-placeholder> - - <!-- Need OSGI JMS Connection Factory Service exposed --> - <reference id="jmsConnectionFactory" interface="javax.jms.ConnectionFactory"/> - - <bean id="appender" class="org.apache.servicemix.logging.jms.JMSAppender" destroy-method="close"> - <property name="jmsConnectionFactory" ref="jmsConnectionFactory"/> - <property name="destinationName" value="${destinationName}" /> - <property name="format" value="${format}"/> - </bean> - - <service ref="appender" interface="org.ops4j.pax.logging.spi.PaxAppender"> - <service-properties> - <entry key="org.ops4j.pax.logging.appender.name" value="JMSLogAppender"/> - </service-properties> - </service> - -</blueprint> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java ---------------------------------------------------------------------- diff --git a/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java b/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java deleted file mode 100644 index 18acb2e..0000000 --- a/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/JMSAppenderTest.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * 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.servicemix.logging.jms; - -import org.apache.activemq.ActiveMQConnectionFactory; -import org.apache.activemq.broker.BrokerService; -import org.apache.activemq.camel.component.ActiveMQComponent; -import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.component.mock.MockEndpoint; -import org.apache.camel.test.junit4.CamelTestSupport; -import org.junit.*; - -import javax.naming.Context; - -/** - * Test cases for {@link JMSAppender} - */ -public class JMSAppenderTest extends CamelTestSupport { - - private static final String EVENTS_TOPIC = "Events"; - - private JMSAppender appender; - private static BrokerService broker; - - @BeforeClass - public static void setupBroker() throws Exception { - broker = new BrokerService(); - broker.setPersistent(false); - broker.setUseJmx(false); - broker.setBrokerName("test.broker"); - broker.start(); - } - - @Before - public void setupBrokerAndAppender() throws Exception { - appender = new JMSAppender(); - appender.setJmsConnectionFactory(new ActiveMQConnectionFactory(broker.getVmConnectorURI().toString() + "?create=false")); - appender.setDestinationName(EVENTS_TOPIC); - } - - @AfterClass - public static void stopBroker() throws Exception { - broker.stop(); - } - - @Test - public void testLogstashAppender() throws InterruptedException { - MockEndpoint events = getMockEndpoint("mock:events"); - events.expectedMessageCount(1); - - appender.doAppend(MockEvents.createInfoEvent()); - - assertMockEndpointsSatisfied(); - } - - @Test - public void testReconnectToBroker() throws Exception { - MockEndpoint events = getMockEndpoint("mock:events"); - events.expectedMessageCount(2); - - appender.doAppend(MockEvents.createInfoEvent()); - - // let's tamper with the underlying JMS connection, causing us to get an exception on the next log event - // afterwards, the appender should recover and start logging again automatically - appender.getOrCreateConnection().close(); - appender.doAppend(MockEvents.createInfoEvent()); - - appender.doAppend(MockEvents.createInfoEvent()); - - assertMockEndpointsSatisfied(); - - - } - - @Override - protected Context createJndiContext() throws Exception { - Context context = super.createJndiContext(); - context.bind("amq", ActiveMQComponent.activeMQComponent(broker.getVmConnectorURI().toString() + "?create=false")); - return context; - } - - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from("amq:topic://" + EVENTS_TOPIC).to("mock:events"); - } - }; - } -} http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java ---------------------------------------------------------------------- diff --git a/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java b/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java deleted file mode 100644 index 0f2fd7b..0000000 --- a/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/LogstashEventFormatTest.java +++ /dev/null @@ -1,50 +0,0 @@ -/** - * 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.servicemix.logging.jms; - -import org.json.JSONException; -import org.json.JSONObject; -import org.junit.Test; -import org.ops4j.pax.logging.spi.PaxLoggingEvent; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - -/** - * Test cases for the {@link LogstashEventFormat} class - */ -public class LogstashEventFormatTest { - - private final LoggingEventFormat format = new LogstashEventFormat(); - - @Test - public void testBasicLogstashFormat() throws JSONException { - PaxLoggingEvent event = MockEvents.createInfoEvent(); - - JSONObject object = new JSONObject(format.toString(event)); - assertEquals(MockEvents.LOG_MESSAGE, object.get(LogstashEventFormat.MESSAGE)); - assertEquals(MockEvents.LOGGER_NAME, object.get(LogstashEventFormat.SOURCE)); - assertEquals("INFO", object.getJSONArray(LogstashEventFormat.TAGS).get(0)); - assertEquals(MockEvents.LOG_PROPERTY_VALUE, - object.getJSONObject(LogstashEventFormat.FIELDS).get(MockEvents.LOG_PROPERTY_ID)); - assertNotNull(object.get(LogstashEventFormat.TIMESTAMP)); - - System.out.println(object); - } - - -} http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java ---------------------------------------------------------------------- diff --git a/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java b/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java deleted file mode 100644 index 8efd7de..0000000 --- a/logging/jms-appender/src/test/java/org/apache/servicemix/logging/jms/MockEvents.java +++ /dev/null @@ -1,53 +0,0 @@ -/** - * 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.servicemix.logging.jms; - -import org.apache.log4j.Level; -import org.apache.log4j.Logger; -import org.apache.log4j.spi.LoggingEvent; -import org.ops4j.pax.logging.service.internal.PaxLoggingEventImpl; -import org.ops4j.pax.logging.spi.PaxLoggingEvent; - -/** - * Helper class to create mock {@link PaxLoggingEvent}s for testing - */ -public class MockEvents { - - public static final String LOGGER_NAME = MockEvents.class.getName(); - public static final String LOG_MESSAGE = "Important message about your application!"; - - public static final String LOG_PROPERTY_ID = "property.id"; - public static final String LOG_PROPERTY_VALUE = "property.value"; - - protected static PaxLoggingEvent createInfoEvent() { - return createInfoEvent(LOGGER_NAME, LOG_MESSAGE); - } - - protected static PaxLoggingEvent createInfoEvent(String name, String message) { - Logger logger = Logger.getLogger(name); - - return createEvent(logger, Level.INFO, message, null); - } - - private static PaxLoggingEvent createEvent(Logger logger, Level level, String message, Exception exception) { - LoggingEvent event = new LoggingEvent(logger.getName(), logger, level, message, exception); - event.setProperty(LOG_PROPERTY_ID, LOG_PROPERTY_VALUE); - return new PaxLoggingEventImpl(event); - } - - -} http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/jms-appender/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/logging/jms-appender/src/test/resources/log4j.properties b/logging/jms-appender/src/test/resources/log4j.properties deleted file mode 100644 index 40b34d4..0000000 --- a/logging/jms-appender/src/test/resources/log4j.properties +++ /dev/null @@ -1,33 +0,0 @@ -# -# 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. -# - -# -# The logging properties used during tests.. -# -log4j.rootLogger=DEBUG, out - -# CONSOLE appender not used by default -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n - -# File appender -log4j.appender.out=org.apache.log4j.FileAppender -log4j.appender.out.layout=org.apache.log4j.PatternLayout -log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n -log4j.appender.out.file=target/jms-appender.log -log4j.appender.out.append=true http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/logging/pom.xml ---------------------------------------------------------------------- diff --git a/logging/pom.xml b/logging/pom.xml deleted file mode 100644 index 04a1b65..0000000 --- a/logging/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.servicemix</groupId> - <artifactId>parent</artifactId> - <version>4.6.0-SNAPSHOT</version> - <relativePath>../parent/pom.xml</relativePath> - </parent> - - <groupId>org.apache.servicemix.logging</groupId> - <artifactId>logging</artifactId> - <packaging>pom</packaging> - <name>Apache ServiceMix :: Features :: Logging</name> - - <modules> - <module>jms-appender</module> - </modules> - -</project> http://git-wip-us.apache.org/repos/asf/servicemix-features/blob/d358d2ea/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d5187ca..607587d 100644 --- a/pom.xml +++ b/pom.xml @@ -37,14 +37,6 @@ <modules> <module>parent</module> - <module>activiti</module> - <module>branding</module> - <module>camel</module> - <module>logging</module> - <module>cxf</module> - <module>examples</module> - <module>itests</module> - <module>assemblies</module> </modules> <scm>
