You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/05/09 16:53:35 UTC
svn commit: r654833 - in /servicemix/smx4/kernel/trunk: ./
gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/
gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/
gshell/gshell-core/src/test/java/org/a...
Author: gnodet
Date: Fri May 9 07:53:34 2008
New Revision: 654833
URL: http://svn.apache.org/viewvc?rev=654833&view=rev
Log:
Fix missing headers, write release notes and fix a possible bug in the log commands
Modified:
servicemix/smx4/kernel/trunk/NOTICE.txt
servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/GrepCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/geronimo/gshell/spring/NoCloseInputStreamTest.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayLog.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/GetLogLevel.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/LruList.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/SetLogLevel.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/VmLogAppender.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/AbsoluteTimeDateFormat.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/DateTimeDateFormat.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/FormattingInfo.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/ISO8601DateFormat.java
servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternParser.java
servicemix/smx4/kernel/trunk/pom.xml
servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java
servicemix/smx4/kernel/trunk/spring/src/main/resources/org/apache/servicemix/kernel/spring/extract.xsl
Modified: servicemix/smx4/kernel/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/NOTICE.txt?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/NOTICE.txt (original)
+++ servicemix/smx4/kernel/trunk/NOTICE.txt Fri May 9 07:53:34 2008
@@ -6,6 +6,4 @@
This product contains software developed by
The Apache Software Foundation (http://www.apache.org/).
- This product contains software developed by
- Open Participation Software for Java (http://www.ops4j.org/).
Modified: servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt (original)
+++ servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt Fri May 9 07:53:34 2008
@@ -15,6 +15,42 @@
* limitations under the License.
*/
+ Apache ServiceMix Kernel 1.0-m3
+ ================================
+
+This third milestone of Apache ServiceMix Kernel brings a lot of new features:
+ * a provisioning system to install applications easily
+ * a log shell to visualize the logging output and change log levels
+ * pipe support on commands
+ * a bunch of new commands: history, grep, cat, ava, exec, sleep
+
+Note that this milestone does not include the latest spring version because
+the latest ones have wrong OSGi manifest headers and do not work.
+
+** Bug
+ * [SMX4KNL-22] - The console can not be reloaded at runtime
+ * [SMX4KNL-29] - Shell commands are not unregistered automatically when the last command is unregistered
+ * [SMX4KNL-31] - Aliases do not work when inside a subshell
+
+** Improvement
+ * [SMX4KNL-5] - Show gshell sub-shell name in prompt
+ * [SMX4KNL-6] - Error Message improvement on Gshell console.
+ * [SMX4KNL-10] - Handle dependant features correctly
+ * [SMX4KNL-21] - Allow pipes in command syntax
+ * [SMX4KNL-25] - Feature commands enhancement.
+ * [SMX4KNL-32] - Lazy load feature repositories to avoid delay when the url can not be accessed or things like that
+
+** New Feature
+ * [SMX4KNL-1] - Implements a log command
+ * [SMX4KNL-11] - Provisioning system
+ * [SMX4KNL-20] - Adding a new OBR command to reload the repository url's
+ * [SMX4KNL-23] - Add a grep command
+ * [SMX4KNL-24] - Add a few utils commands: cat, java, exec, sleep
+ * [SMX4KNL-26] - Spring URL handler to wrap xml spring files into bundles for direct installation.
+ * [SMX4KNL-27] - Include an implementation of the Preferences service
+ * [SMX4KNL-30] - Create an history command to be able to browse previous commands easily
+
+
Apache ServiceMix Kernel 1.0-m2
================================
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java Fri May 9 07:53:34 2008
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.geronimo.gshell.commands.builtins;
import java.io.PrintWriter;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java Fri May 9 07:53:34 2008
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.geronimo.gshell.commands.builtins;
import java.util.List;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryCommand.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/HistoryCommand.java Fri May 9 07:53:34 2008
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.geronimo.gshell.commands.builtins;
import java.util.List;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java Fri May 9 07:53:34 2008
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.geronimo.gshell.commands.builtins;
import java.util.Iterator;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java Fri May 9 07:53:34 2008
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.geronimo.gshell.commands.builtins;
import java.io.BufferedReader;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java Fri May 9 07:53:34 2008
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.geronimo.gshell.commands.builtins;
import java.util.List;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/GrepCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/GrepCommand.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/GrepCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/utils/GrepCommand.java Fri May 9 07:53:34 2008
@@ -1,3 +1,21 @@
+/*
+ * 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.geronimo.gshell.commands.utils;
import java.io.IOException;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/geronimo/gshell/spring/NoCloseInputStreamTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/geronimo/gshell/spring/NoCloseInputStreamTest.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/geronimo/gshell/spring/NoCloseInputStreamTest.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-core/src/test/java/org/apache/geronimo/gshell/spring/NoCloseInputStreamTest.java Fri May 9 07:53:34 2008
@@ -1,3 +1,21 @@
+/*
+ * 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.geronimo.gshell.spring;
import java.io.IOException;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayLog.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayLog.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayLog.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayLog.java Fri May 9 07:53:34 2008
@@ -23,6 +23,9 @@
import org.apache.servicemix.gshell.log.layout.PatternParser;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+/**
+ * Displays the last log entries
+ */
@CommandComponent(id = "log:display", description = "Display log entries")
public class DisplayLog extends OsgiCommandSupport {
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/GetLogLevel.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/GetLogLevel.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/GetLogLevel.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/GetLogLevel.java Fri May 9 07:53:34 2008
@@ -32,10 +32,7 @@
import org.osgi.service.cm.Configuration;
/**
- * User: ewoodman
- * Date: March 3, 2008
- * Time: 11:10:10 AM
- * To change this template use File | Settings | File Templates.
+ * Get the log level for a given logger
*/
@CommandComponent(id = "log:get", description = "Show Log Level")
public class GetLogLevel extends OsgiCommandSupport {
@@ -51,7 +48,7 @@
protected Object doExecute() throws Exception {
ConfigurationAdmin cfgAdmin = getConfigAdmin();
- Configuration cfg = cfgAdmin.getConfiguration(CONFIGURATION_PID);
+ Configuration cfg = cfgAdmin.getConfiguration(CONFIGURATION_PID, null);
Dictionary props = cfg.getProperties();
if (ROOT_LOGGER.equalsIgnoreCase(this.logger)) {
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/LruList.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/LruList.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/LruList.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/LruList.java Fri May 9 07:53:34 2008
@@ -1,3 +1,21 @@
+/*
+ * 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.gshell.log;
import java.util.AbstractList;
@@ -6,11 +24,7 @@
import java.util.Arrays;
/**
- * Created by IntelliJ IDEA.
- * User: gnodet
- * Date: Apr 28, 2008
- * Time: 6:15:47 PM
- * To change this template use File | Settings | File Templates.
+ * A list that only keep the last N elements added
*/
public class LruList<E> {
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/SetLogLevel.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/SetLogLevel.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/SetLogLevel.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/SetLogLevel.java Fri May 9 07:53:34 2008
@@ -27,10 +27,7 @@
import org.osgi.framework.ServiceReference;
/**
- * User: ewoodman
- * Date: March 3, 2008
- * Time: 11:10:10 AM
- * To change this template use File | Settings | File Templates.
+ * Set the log level for a given logger
*/
@CommandComponent(id = "log:set", description = "Change the log level")
public class SetLogLevel extends OsgiCommandSupport {
@@ -72,7 +69,7 @@
}
ConfigurationAdmin cfgAdmin = getConfigAdmin();
- Configuration cfg = cfgAdmin.getConfiguration(CONFIGURATION_PID);
+ Configuration cfg = cfgAdmin.getConfiguration(CONFIGURATION_PID, null);
Dictionary props = cfg.getProperties();
String logger = this.logger;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/VmLogAppender.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/VmLogAppender.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/VmLogAppender.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/VmLogAppender.java Fri May 9 07:53:34 2008
@@ -1,14 +1,28 @@
+/*
+ * 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.gshell.log;
import org.ops4j.pax.logging.spi.PaxAppender;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
/**
- * Created by IntelliJ IDEA.
- * User: gnodet
- * Date: Apr 28, 2008
- * Time: 5:13:39 PM
- * To change this template use File | Settings | File Templates.
+ * A Pax Logging appender that keep a list of last events
*/
public class VmLogAppender implements PaxAppender {
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/AbsoluteTimeDateFormat.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/AbsoluteTimeDateFormat.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/AbsoluteTimeDateFormat.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/AbsoluteTimeDateFormat.java Fri May 9 07:53:34 2008
@@ -23,7 +23,9 @@
import java.text.ParsePosition;
import java.text.DateFormat;
-
+/**
+ * Copied from log4j
+ */
/**
Formats a {@link Date} in the format "HH:mm:ss,SSS" for example,
"15:49:37,459".
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/DateTimeDateFormat.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/DateTimeDateFormat.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/DateTimeDateFormat.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/DateTimeDateFormat.java Fri May 9 07:53:34 2008
@@ -24,6 +24,9 @@
import java.text.DateFormatSymbols;
/**
+ * Copied from log4j
+ */
+/**
Formats a {@link Date} in the format "dd MMM yyyy HH:mm:ss,SSS" for example,
"06 Nov 1994 15:49:37,459".
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/FormattingInfo.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/FormattingInfo.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/FormattingInfo.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/FormattingInfo.java Fri May 9 07:53:34 2008
@@ -18,6 +18,9 @@
/**
+ * Copied from log4j
+ */
+/**
FormattingInfo instances contain the information obtained when parsing
formatting modifiers in conversion modifiers.
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/ISO8601DateFormat.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/ISO8601DateFormat.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/ISO8601DateFormat.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/ISO8601DateFormat.java Fri May 9 07:53:34 2008
@@ -22,8 +22,10 @@
import java.text.FieldPosition;
import java.text.ParsePosition;
+/**
+ * Copied from log4j
+ */
// Contributors: Arndt Schoenewald <ar...@ibm23093i821.mc.schoenewald.de>
-
/**
Formats a {@link Date} in the format "yyyy-MM-dd HH:mm:ss,SSS" for example
"1999-11-27 15:49:37,459".
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternParser.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternParser.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternParser.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternParser.java Fri May 9 07:53:34 2008
@@ -25,10 +25,12 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+/**
+ * Copied from log4j
+ */
// Contributors: Nelson Minar <(n...@monkey.org>
// Igor E. Poteryaev <ja...@mail.ru>
// Reinhard Deschler <re...@web.de>
-
/**
Most of the work of the {@link org.apache.log4j.PatternLayout} class
is delegated to the PatternParser class.
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Fri May 9 07:53:34 2008
@@ -69,18 +69,18 @@
<felix.configadmin.version>1.0.0</felix.configadmin.version>
<felix.main.version>1.0.4</felix.main.version>
<felix.plugin.version>1.4.0</felix.plugin.version>
- <felix.framework.version>1.1.0-r631613</felix.framework.version>
+ <felix.framework.version>1.0.4</felix.framework.version>
<felix.osgi.version>1.0.0</felix.osgi.version>
<felix.compendium.version>1.0.0</felix.compendium.version>
<felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
- <gshell.version>1.0-alpha-2-SNAPSHOT</gshell.version>
+ <gshell.version>1.0-alpha-2-r654638</gshell.version>
<junit.version>4.4</junit.version>
- <jline.version>0.9.93</jline.version>
+ <jline.version>0.9.94</jline.version>
<log4j.version>1.2.14</log4j.version>
<mina.version>1.1.6</mina.version>
- <pax.logging.version>1.1-SNAPSHOT</pax.logging.version>
+ <pax.logging.version>1.1.0</pax.logging.version>
<pax.url.version>0.3.0</pax.url.version>
<servicemix.legal.version>1.0</servicemix.legal.version>
<spring.osgi.version>1.0.2</spring.osgi.version>
@@ -453,6 +453,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.4</version>
+ <configuration>
+ <source>1.5</source>
+ </configuration>
<executions>
<execution>
<id>attach-javadocs</id>
Modified: servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java (original)
+++ servicemix/smx4/kernel/trunk/spring/src/main/java/org/apache/servicemix/kernel/spring/SpringTransformer.java Fri May 9 07:53:34 2008
@@ -1,3 +1,20 @@
+/**
+ *
+ * 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.kernel.spring;
import java.io.BufferedReader;
Modified: servicemix/smx4/kernel/trunk/spring/src/main/resources/org/apache/servicemix/kernel/spring/extract.xsl
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/spring/src/main/resources/org/apache/servicemix/kernel/spring/extract.xsl?rev=654833&r1=654832&r2=654833&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/spring/src/main/resources/org/apache/servicemix/kernel/spring/extract.xsl (original)
+++ servicemix/smx4/kernel/trunk/spring/src/main/resources/org/apache/servicemix/kernel/spring/extract.xsl Fri May 9 07:53:34 2008
@@ -1,5 +1,22 @@
<?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.
+
+-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:beans="http://www.springframework.org/schema/beans"