Author: gnodet
Date: Mon Jul 30 15:27:12 2007
New Revision: 561158
URL: http://svn.apache.org/viewvc?view=rev&rev=561158
Log:
Use libraries available on public repos
Added:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/pom.xml
(with props)
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java
(with props)
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java
(with props)
Modified:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/izpack-mac.xml
incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/servicemix.sh
incubator/servicemix/branches/osgi/servicemix-osgi-spring/osgi.iws
incubator/servicemix/branches/osgi/servicemix-osgi-spring/pom.xml
Modified:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/izpack-mac.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/izpack-mac.xml?view=diff&rev=561158&r1=561157&r2=561158
==============================================================================
---
incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/izpack-mac.xml
(original)
+++
incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/izpack-mac.xml
Mon Jul 30 15:27:12 2007
@@ -61,6 +61,8 @@
<executable os="unix" targetfile="$INSTALL_PATH/bin/${app}"
stage="never" keep="true" />
<parsable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}"
type="shell" />
<executable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}"
stage="never" keep="true" />
+ <parsable os="unix" targetfile="$INSTALL_PATH/bin/servicemix.sh"
type="shell" />
+ <executable os="unix" targetfile="$INSTALL_PATH/bin/servicemix.sh"
stage="never" keep="true" />
</pack>
</packs>
</installation>
Modified:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/servicemix.sh
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/servicemix.sh?view=diff&rev=561158&r1=561157&r2=561158
==============================================================================
---
incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/servicemix.sh
(original)
+++
incubator/servicemix/branches/osgi/servicemix-osgi-spring/installers/src/main/installers/servicemix.sh
Mon Jul 30 15:27:12 2007
@@ -232,7 +232,8 @@
fi
cd "$SERVICEMIX_HOME"
if [ "x$1" = "x" ] ; then
- exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -jar "$JAR"
"$SERVICEMIX_HOME" start
+ #exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -jar
"$JAR" "$SERVICEMIX_HOME" start
+ exec $JAVA $JAVA_OPTS
-Dfelix.config.properties=file:$SERVICEMIX_HOME/conf/config.properties
-Dservicemix.home="$SERVICEMIX_HOME" -jar bin/servicemix.jar
else
exec $JAVA $JAVA_OPTS -Dservicemix.home="$SERVICEMIX_HOME" -jar "$JAR"
"$SERVICEMIX_HOME" "$1"
fi
Added:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/pom.xml?view=auto&rev=561158
==============================================================================
---
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/pom.xml
(added)
+++
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/pom.xml
Mon Jul 30 15:27:12 2007
@@ -0,0 +1,24 @@
+<project>
+ <parent>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>felix</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <packaging>jar</packaging>
+ <name>Apache Felix Daemon</name>
+ <artifactId>org.apache.felix.daemon</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>0.9.0-incubator-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.daemon</groupId>
+ <artifactId>daemon-bootstrappers</artifactId>
+ <version>1.0-RC2</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Added:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java?view=auto&rev=561158
==============================================================================
---
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java
(added)
+++
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java
Mon Jul 30 15:27:12 2007
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.felix.daemon;
+
+
+import java.io.File;
+import org.apache.directory.daemon.InstallationLayout;
+
+
+/**
+ * A felix specific installation layout.
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Felix Project Team</a>
+ */
+public class FelixLayout extends InstallationLayout
+{
+ public FelixLayout( InstallationLayout layout )
+ {
+ super( layout.getBaseDirectory() );
+ }
+
+
+ public FelixLayout( File baseDirectory )
+ {
+ super( baseDirectory );
+ }
+
+
+ public FelixLayout( String baseDirectoryPath )
+ {
+ super( baseDirectoryPath );
+ }
+
+
+ public File getBundleDirectory()
+ {
+ return new File( super.baseDirectory, "bundle" );
+ }
+
+
+ public File getConfigurationFile()
+ {
+ return super.getConfigurationFile( "config.properties" );
+ }
+
+
+ public File getSystemPropertiesFile()
+ {
+ return new File( super.baseDirectory, "system.properties" );
+ }
+}
Propchange:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/FelixLayout.java
------------------------------------------------------------------------------
svn:executable = *
Added:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java?view=auto&rev=561158
==============================================================================
---
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java
(added)
+++
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java
Mon Jul 30 15:27:12 2007
@@ -0,0 +1,296 @@
+/*
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed 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.felix.daemon;
+
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.Properties;
+
+import org.apache.directory.daemon.DaemonApplication;
+import org.apache.directory.daemon.InstallationLayout;
+
+import org.apache.felix.framework.Felix;
+import org.apache.felix.framework.cache.BundleCache;
+import org.apache.felix.framework.util.StringMap;
+
+
+/**
+ * NOTE: Does not set system properties which are done via a daemon ui, some
+ * init script, or a main() application entry point.
+ */
+public class Service implements DaemonApplication
+{
+ /**
+ * The system property name used to specify an URL to the configuration
+ * property file to be used for the created the framework instance.
+ */
+ public static final String CONFIG_PROPERTIES_PROP =
"felix.config.properties";
+ /** The default name used for the configuration properties file. */
+ public static final String CONFIG_PROPERTIES_FILE_VALUE =
"config.properties";
+ /** the default profile if no profile name or path is specified */
+ public static final String DEFAULT_PRODUCTION_PROFILE = "production";
+
+ /** the instance of Felix managed by this daemon/service */
+ private Felix instance;
+ /** the configuration properties loaded from the configuration file */
+ private Properties configationProperties;
+ /** the felix installation layout */
+ private FelixLayout layout;
+
+
+ public Felix getFelixInstance()
+ {
+ return instance;
+ }
+
+
+ public void init( InstallationLayout suppliedLayout, String[] args )
throws Exception
+ {
+ if ( !( suppliedLayout instanceof FelixLayout ) )
+ {
+ this.layout = new FelixLayout( suppliedLayout );
+ }
+ else
+ {
+ this.layout = ( FelixLayout ) suppliedLayout;
+ }
+
+ configationProperties = readConfigProperties();
+ instance = new Felix(new StringMap(configationProperties, false ),
null );
+ }
+
+
+ public void start()
+ {
+ // See if the profile name property was specified.
+ String profileName = configationProperties.getProperty(
BundleCache.CACHE_PROFILE_PROP );
+
+ // See if the profile directory property was specified.
+ String profileDirName = configationProperties.getProperty(
BundleCache.CACHE_PROFILE_DIR_PROP );
+
+ // If no profile or profile directory is specified in the properties,
then set the
+ // name to the default production mode profile name since this is not
started from main()
+ if ( ( profileName == null ) && ( profileDirName == null ) )
+ {
+ configationProperties.setProperty( BundleCache.CACHE_PROFILE_PROP,
DEFAULT_PRODUCTION_PROFILE );
+ }
+
+ // start up the instance using the loaded and possibly altered
configuration
+ try
+ {
+ instance.start();
+ }
+ catch (Exception ex)
+ {
+ // TODO: find out what to do
+ }
+ }
+
+
+ public void stop( String[] arg0 ) throws Exception
+ {
+ instance.stop();
+ }
+
+
+ public void destroy()
+ {
+ }
+
+
+ /**
+ * Exposes configuration properties for potential alteration between load
+ * time at init() and start() by the managing framework or by the main().
+ *
+ * @return the configuration properties loaded by default from
conf/config.properties
+ */
+ public Properties getConfigurationProperties()
+ {
+ return configationProperties;
+ }
+
+
+ /**
+ * <p>
+ * Reads the configuration properties in the configuration property
+ * file associated with the framework installation; these properties are
+ * only accessible to the framework and are intended for configuration
+ * purposes. By default, the configuration property file is located in
+ * the same directory as the <tt>felix.jar</tt> file and is called
+ * "<tt>config.properties</tt>". This may be changed by setting the
+ * "<tt>felix.config.properties</tt>" system property to an
+ * arbitrary URL.
+ * </p>
+ * @return A <tt>Properties</tt> instance or <tt>null</tt> if there was an
error.
+ */
+ private Properties readConfigProperties()
+ {
+ // The config properties file is either present in a default
+ // location using the layout, or is specified by a system property
+ // Try to load it from one of these places.
+
+ // See if the property URL was specified as a property.
+ URL propURL = null;
+ String custom = System.getProperty( CONFIG_PROPERTIES_PROP );
+ if ( custom != null )
+ {
+ try
+ {
+ propURL = new URL( custom );
+ }
+ catch ( MalformedURLException ex )
+ {
+ System.err.print( "Main: " + ex );
+ return null;
+ }
+ }
+ else
+ {
+ try
+ {
+ propURL = layout.getConfigurationFile().toURL();
+ }
+ catch ( MalformedURLException ex )
+ {
+ System.err.print( "Main: " + ex );
+ return null;
+ }
+ }
+
+ // Read the properties file.
+ Properties props = new Properties();
+ InputStream is = null;
+ try
+ {
+ is = propURL.openConnection().getInputStream();
+ props.load( is );
+ is.close();
+ }
+ catch ( FileNotFoundException ex )
+ {
+ // Ignore file not found.
+ }
+ catch ( Exception ex )
+ {
+ System.err.println( "Error loading config properties from " +
propURL );
+ System.err.println( "Main: " + ex );
+
+ try
+ {
+ if ( is != null )
+ {
+ is.close();
+ }
+ }
+ catch ( IOException ex2 )
+ {
+ // Nothing we can do.
+ }
+
+ return null;
+ }
+
+ // Perform variable substitution for system properties.
+ for ( Enumeration e = props.propertyNames(); e.hasMoreElements(); /*
EMPTY */ )
+ {
+ String name = ( String ) e.nextElement();
+ props.setProperty( name, substVars( ( String ) props.getProperty(
name ) ) );
+ }
+
+ return props;
+ }
+
+
+ private static final String DELIM_START = "${";
+ private static final char DELIM_STOP = '}';
+ private static final int DELIM_START_LEN = 2;
+ private static final int DELIM_STOP_LEN = 1;
+
+
+ /**
+ * <p>
+ * This method performs system property variable substitution on the
+ * specified string value. If the specified string contains the syntax
+ * <tt>${<system-prop-name>}</tt>, then the corresponding system
+ * property value is substituted for the marker.
+ * </p>
+ *
+ * @param val
+ * The string on which to perform system property substitution.
+ * @return The value of the specified string after system property
+ * substitution.
+ * @throws IllegalArgumentException
+ * If there was a syntax error in the system property variable
+ * marker syntax.
+ */
+ public static String substVars( String val ) throws
IllegalArgumentException
+ {
+ StringBuffer sbuf = new StringBuffer();
+
+ if ( val == null )
+ {
+ return val;
+ }
+
+ int i = 0;
+ int j, k;
+
+ while ( true )
+ {
+ j = val.indexOf( DELIM_START, i );
+ if ( j == -1 )
+ {
+ if ( i == 0 )
+ {
+ return val;
+ }
+ else
+ {
+ sbuf.append( val.substring( i, val.length() ) );
+ return sbuf.toString();
+ }
+ }
+ else
+ {
+ sbuf.append( val.substring( i, j ) );
+ k = val.indexOf( DELIM_STOP, j );
+ if ( k == -1 )
+ {
+ throw new IllegalArgumentException( '"' + val
+ + "\" has no closing brace. Opening brace at position
" + j + '.' );
+ }
+ else
+ {
+ j += DELIM_START_LEN;
+ String key = val.substring( j, k );
+ // Try system properties.
+ String replacement = System.getProperty( key, null );
+ if ( replacement != null )
+ {
+ sbuf.append( replacement );
+ }
+ i = k + DELIM_STOP_LEN;
+ }
+ }
+ }
+ }
+}
Propchange:
incubator/servicemix/branches/osgi/servicemix-osgi-spring/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Service.java
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/servicemix/branches/osgi/servicemix-osgi-spring/osgi.iws
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi-spring/osgi.iws?view=diff&rev=561158&r1=561157&r2=561158
==============================================================================
--- incubator/servicemix/branches/osgi/servicemix-osgi-spring/osgi.iws
(original)
+++ incubator/servicemix/branches/osgi/servicemix-osgi-spring/osgi.iws Mon Jul
30 15:27:12 2007
@@ -192,91 +192,91 @@
<component name="FavoritesProjectViewPane" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="pom.xml" pinned="false" current="false"
current-in-tab="false">
+ <file leaf-file-name="pom.xml" pinned="false" current="true"
current-in-tab="true">
<entry file="file://$PROJECT_DIR$/installers/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="335" column="70" selection-start="13278"
selection-end="13278" vertical-scroll-proportion="0.02264151">
+ <state line="194" column="39" selection-start="6929"
selection-end="6929" vertical-scroll-proportion="0.8674847">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="config.properties" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/config.properties">
+ <file leaf-file-name="izpack-mac.xml" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/izpack-mac.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="80" selection-start="1154"
selection-end="1154" vertical-scroll-proportion="0.02264151">
+ <state line="63" column="6" selection-start="2280"
selection-end="2280" vertical-scroll-proportion="0.9108434">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/bundles/servicemix-core/pom.xml">
+ <file leaf-file-name="servicemix.bat" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/servicemix.bat">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="16" selection-start="2377"
selection-end="2377" vertical-scroll-proportion="0.48301888">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/bundles/pom.xml">
+ <file leaf-file-name="servicemix.sh" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/servicemix.sh">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="52" selection-start="1584"
selection-end="1584" vertical-scroll-proportion="0.02264151">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/services/jmx/pom.xml">
+ <file leaf-file-name="config.properties" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/config.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="27" selection-start="1570"
selection-end="1570" vertical-scroll-proportion="0.36981133">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="servicemix-jmx.xml" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/services/jmx/src/main/resources/META-INF/spring/servicemix-jmx.xml">
+ <file leaf-file-name="bootstrapper.properties" pinned="false"
current="false" current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/bootstrapper.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="58" column="10" selection-start="2290"
selection-end="2446" vertical-scroll-proportion="0.8735849">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="pom.xml" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/services/nmr/pom.xml">
+ <file leaf-file-name="log4j.properties" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="18" selection-start="1448"
selection-end="1448" vertical-scroll-proportion="0.16603774">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Container.java" pinned="false" current="false"
current-in-tab="false">
- <entry
file="file://$PROJECT_DIR$/services/nmr/src/main/java/org/apache/servicemix/nmr/Container.java">
+ <file leaf-file-name="izpack-unix.xml" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/izpack-unix.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="13" selection-start="268"
selection-end="268" vertical-scroll-proportion="0.24220183">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="servicemix-nmr.xml" pinned="false" current="true"
current-in-tab="true">
- <entry
file="file://$PROJECT_DIR$/services/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml">
+ <file leaf-file-name="izpack-windows.xml" pinned="false" current="false"
current-in-tab="false">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/izpack-windows.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="25" selection-start="1729"
selection-end="1729" vertical-scroll-proportion="0.21100917">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="-0.084337346">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="pom.xml" pinned="false" current="false"
current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/bundles/j2ee-connector/pom.xml">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
+ <state line="17" column="33" selection-start="400"
selection-end="400" vertical-scroll-proportion="0.24578314">
<folding />
</state>
</provider>
@@ -407,6 +407,134 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="installers" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="installers" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="installers" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers/src/main" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers/src/main/installers" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="installers" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers/src" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers/src/main" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers/src/main/installers" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId"
value="PsiDirectory:$PROJECT_DIR$/installers/src/main/installers/bundle" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="bundles" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="osgi.ipr" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="bundles" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/bundles" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -614,14 +742,14 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="0" y="22" width="1437" height="692" extended-state="0" />
- <editor active="false" />
+ <frame x="0" y="22" width="1680" height="977" extended-state="6" />
+ <editor active="true" />
<layout>
<window_info id="UI Designer" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" order="3" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" order="3" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.47262248"
order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="true" weight="0.40220723"
order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false"
internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="1" />
<window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" order="1" />
<window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" order="8" />
@@ -728,107 +856,107 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry
file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Classes/classes.jar!/org/xml/sax/EntityResolver.class">
+ <entry file="file://$PROJECT_DIR$/bundles/j2ee-connector/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="17" selection-start="153" selection-end="153"
vertical-scroll-proportion="0.10526316">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Classes/classes.jar!/java/security/SecureClassLoader.class">
+ <entry
file="file://$PROJECT_DIR$/services/nmr/src/main/java/org/apache/servicemix/nmr/Container.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="13" selection-start="151" selection-end="151"
vertical-scroll-proportion="0.10526316">
+ <state line="11" column="13" selection-start="268" selection-end="268"
vertical-scroll-proportion="0.15903614">
<folding />
</state>
</provider>
</entry>
- <entry
file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Classes/classes.jar!/java/lang/ClassLoader.class">
+ <entry
file="file://$PROJECT_DIR$/services/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="26" selection-start="156" selection-end="167"
vertical-scroll-proportion="0.0">
+ <state line="38" column="25" selection-start="1729"
selection-end="1729" vertical-scroll-proportion="0.4506024">
<folding />
</state>
</provider>
</entry>
- <entry
file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Classes/classes.jar!/java/util/Arrays.class">
+ <entry file="file://$PROJECT_DIR$/bundles/servicemix-core/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="13" selection-start="147" selection-end="147"
vertical-scroll-proportion="0.0">
+ <state line="50" column="16" selection-start="2377"
selection-end="2377" vertical-scroll-proportion="0.6385542">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/installers/installers.iml">
+ <entry file="file://$PROJECT_DIR$/bundles/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
+ <state line="52" column="52" selection-start="1584"
selection-end="1584" vertical-scroll-proportion="0.7518072">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/installers/pom.xml">
+ <entry file="file://$PROJECT_DIR$/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="335" column="70" selection-start="13278"
selection-end="13278" vertical-scroll-proportion="0.02264151">
+ <state line="17" column="33" selection-start="400" selection-end="400"
vertical-scroll-proportion="0.24578314">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/config.properties">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/izpack-windows.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="18" column="80" selection-start="1154"
selection-end="1154" vertical-scroll-proportion="0.02264151">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="-0.084337346">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bundles/servicemix-core/pom.xml">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/izpack-unix.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="50" column="16" selection-start="2377"
selection-end="2377" vertical-scroll-proportion="0.48301888">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bundles/pom.xml">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/servicemix.bat">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="52" selection-start="1584"
selection-end="1584" vertical-scroll-proportion="0.02264151">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/services/jmx/pom.xml">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/config.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="27" selection-start="1570"
selection-end="1570" vertical-scroll-proportion="0.36981133">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/services/jmx/src/main/resources/META-INF/spring/servicemix-jmx.xml">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/bootstrapper.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="58" column="10" selection-start="2290"
selection-end="2446" vertical-scroll-proportion="0.8735849">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/services/nmr/pom.xml">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/log4j.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="18" selection-start="1448"
selection-end="1448" vertical-scroll-proportion="0.16603774">
+ <state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/services/nmr/src/main/java/org/apache/servicemix/nmr/Container.java">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/izpack-mac.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="11" column="13" selection-start="268" selection-end="268"
vertical-scroll-proportion="0.24220183">
+ <state line="63" column="6" selection-start="2280"
selection-end="2280" vertical-scroll-proportion="0.9108434">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/bundles/j2ee-connector/pom.xml">
+ <entry
file="file://$PROJECT_DIR$/installers/src/main/installers/servicemix.sh">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0"
vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry
file="file://$PROJECT_DIR$/services/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml">
+ <entry file="file://$PROJECT_DIR$/installers/pom.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="38" column="25" selection-start="1729"
selection-end="1729" vertical-scroll-proportion="0.21100917">
+ <state line="194" column="39" selection-start="6929"
selection-end="6929" vertical-scroll-proportion="0.8674847">
<folding />
</state>
</provider>
Modified: incubator/servicemix/branches/osgi/servicemix-osgi-spring/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/branches/osgi/servicemix-osgi-spring/pom.xml?view=diff&rev=561158&r1=561157&r2=561158
==============================================================================
--- incubator/servicemix/branches/osgi/servicemix-osgi-spring/pom.xml (original)
+++ incubator/servicemix/branches/osgi/servicemix-osgi-spring/pom.xml Mon Jul
30 15:27:12 2007
@@ -9,13 +9,14 @@
<version>4.0-SNAPSHOT</version>
<modules>
+ <module>org.apache.felix.daemon</module>
<module>bundles</module>
<module>services</module>
<module>installers</module>
</modules>
<properties>
- <felix.version>1.0.0</felix.version>
+ <felix.version>0.9.0-incubator-SNAPSHOT</felix.version>
<spring.version>2.1-SNAPSHOT</spring.version>
<servicemix.version>4.0-SNAPSHOT</servicemix.version>
</properties>
@@ -32,6 +33,22 @@
<enabled>true</enabled>
</snapshots>
</repository>
+ <repository>
+ <id>springframework.org</id>
+ <name>Springframework Maven Repository</name>
+ <url>http://static.springframework.org/maven2/</url>
+ </repository>
+ <repository>
+ <id>springframework.org snaphots</id>
+ <name>Springframework Maven SNAPSHOT Repository</name>
+ <url>http://static.springframework.org/maven2-snapshots/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
</repositories>
<pluginRepositories>
