You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@excalibur.apache.org by le...@apache.org on 2004/07/08 14:34:32 UTC
svn commit: rev 22715 - in excalibur/trunk: . components/datasource components/monitor components/pool components/pool/api components/pool/impl components/pool/instrumented components/sourceresolve components/store components/thread components/thread/api components/thread/impl components/thread/instrumented components/xmlutil containerkit/instrument containerkit/instrument-client containerkit/instrument-manager/altrmi containerkit/instrument-manager/http containerkit/instrument-manager/impl containerkit/instrument-manager/spi containerkit/lifecycle containerkit/logger deprecated/component deprecated/component-examples/instrument-manager deprecated/component-tests deprecated/event/api deprecated/event/impl deprecated/testcase fortress
Author: leosimons
Date: Thu Jul 8 05:34:32 2004
New Revision: 22715
Modified:
excalibur/trunk/components/datasource/project.xml
excalibur/trunk/components/monitor/project.xml
excalibur/trunk/components/pool/api/project.xml
excalibur/trunk/components/pool/impl/project.xml
excalibur/trunk/components/pool/instrumented/project.xml
excalibur/trunk/components/pool/project.xml
excalibur/trunk/components/sourceresolve/project.xml
excalibur/trunk/components/store/project.xml
excalibur/trunk/components/thread/api/project.xml
excalibur/trunk/components/thread/impl/project.xml
excalibur/trunk/components/thread/instrumented/project.xml
excalibur/trunk/components/thread/project.xml
excalibur/trunk/components/xmlutil/project.xml
excalibur/trunk/containerkit/instrument-client/project.xml
excalibur/trunk/containerkit/instrument-manager/altrmi/project.xml
excalibur/trunk/containerkit/instrument-manager/http/project.xml
excalibur/trunk/containerkit/instrument-manager/impl/project.xml
excalibur/trunk/containerkit/instrument-manager/spi/project.xml
excalibur/trunk/containerkit/instrument/project.xml
excalibur/trunk/containerkit/lifecycle/project-common.xml
excalibur/trunk/containerkit/lifecycle/project.xml
excalibur/trunk/containerkit/logger/project.xml
excalibur/trunk/deprecated/component-examples/instrument-manager/project.xml
excalibur/trunk/deprecated/component-tests/project.xml
excalibur/trunk/deprecated/component/project.xml
excalibur/trunk/deprecated/event/api/project.xml
excalibur/trunk/deprecated/event/impl/project.xml
excalibur/trunk/deprecated/testcase/project.xml
excalibur/trunk/excalibur-trunk.ipr
excalibur/trunk/excalibur-trunk.iws
excalibur/trunk/fortress/fortress.iml
Log:
Fix the buildsystem after the reorganization. Reduce the number of versions.
Modified: excalibur/trunk/components/datasource/project.xml
==============================================================================
--- excalibur/trunk/components/datasource/project.xml (original)
+++ excalibur/trunk/components/datasource/project.xml Thu Jul 8 05:34:32 2004
@@ -16,11 +16,10 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Datasource</name>
<id>excalibur-datasource</id>
- <currentVersion>1.2.2-dev</currentVersion>
<inceptionYear>2003</inceptionYear>
<shortDescription>Excalibur's Datasourc component</shortDescription>
<description>
Modified: excalibur/trunk/components/monitor/project.xml
==============================================================================
--- excalibur/trunk/components/monitor/project.xml (original)
+++ excalibur/trunk/components/monitor/project.xml Thu Jul 8 05:34:32 2004
@@ -16,11 +16,10 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Monitor</name>
<id>excalibur-monitor</id>
- <currentVersion>1.1</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>Avalon Excalibur's resource management code allows you to be notified when a resource has changed.</shortDescription>
<description>
Modified: excalibur/trunk/components/pool/api/project.xml
==============================================================================
--- excalibur/trunk/components/pool/api/project.xml (original)
+++ excalibur/trunk/components/pool/api/project.xml Thu Jul 8 05:34:32 2004
@@ -17,7 +17,7 @@
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>excalibur-pool</groupId>
<id>excalibur-pool-api</id>
@@ -25,7 +25,6 @@
<package>org.apache.avalon.excalibur.pool</package>
<inceptionYear>2001</inceptionYear>
<shortDescription>Excalibur Pool API</shortDescription>
- <currentVersion>2.0.0</currentVersion>
<dependencies>
<dependency>
Modified: excalibur/trunk/components/pool/impl/project.xml
==============================================================================
--- excalibur/trunk/components/pool/impl/project.xml (original)
+++ excalibur/trunk/components/pool/impl/project.xml Thu Jul 8 05:34:32 2004
@@ -17,7 +17,7 @@
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>excalibur-pool</groupId>
<id>excalibur-pool-impl</id>
@@ -25,7 +25,6 @@
<package>org.apache.avalon.excalibur.pool</package>
<inceptionYear>2001</inceptionYear>
<shortDescription>Excalibur Pool Implementation</shortDescription>
- <currentVersion>2.0.0</currentVersion>
<dependencies>
<dependency>
Modified: excalibur/trunk/components/pool/instrumented/project.xml
==============================================================================
--- excalibur/trunk/components/pool/instrumented/project.xml (original)
+++ excalibur/trunk/components/pool/instrumented/project.xml Thu Jul 8 05:34:32 2004
@@ -17,14 +17,13 @@
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>excalibur-pool</groupId>
<id>excalibur-pool-instrumented</id>
<name>Excalibur Pool Instrumented Implementation</name>
<package>org.apache.excalibur.pool</package>
<inceptionYear>2001</inceptionYear>
- <currentVersion>2.0.0</currentVersion>
<shortDescription>Excalibur Pool Instrumented Implementation</shortDescription>
<dependencies>
Modified: excalibur/trunk/components/pool/project.xml
==============================================================================
--- excalibur/trunk/components/pool/project.xml (original)
+++ excalibur/trunk/components/pool/project.xml Thu Jul 8 05:34:32 2004
@@ -17,11 +17,11 @@
limitations under the License.
-->
<project>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Pool</name>
<groupId>excalibur-pool</groupId>
<id>excalibur-pool</id>
- <currentVersion>2.0.0</currentVersion>
<inceptionYear>2000</inceptionYear>
</project>
Modified: excalibur/trunk/components/sourceresolve/project.xml
==============================================================================
--- excalibur/trunk/components/sourceresolve/project.xml (original)
+++ excalibur/trunk/components/sourceresolve/project.xml Thu Jul 8 05:34:32 2004
@@ -16,11 +16,10 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Sourceresolve</name>
<id>excalibur-sourceresolve</id>
- <currentVersion>2.0</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>A utility for finding resources given an URI</shortDescription>
<description>
Modified: excalibur/trunk/components/store/project.xml
==============================================================================
--- excalibur/trunk/components/store/project.xml (original)
+++ excalibur/trunk/components/store/project.xml Thu Jul 8 05:34:32 2004
@@ -16,11 +16,10 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Store</name>
<id>excalibur-store</id>
- <currentVersion>1.1</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>a way to store named objects without caring where or how they are stored.</shortDescription>
<description>
Modified: excalibur/trunk/components/thread/api/project.xml
==============================================================================
--- excalibur/trunk/components/thread/api/project.xml (original)
+++ excalibur/trunk/components/thread/api/project.xml Thu Jul 8 05:34:32 2004
@@ -18,12 +18,11 @@
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>excalibur-thread</groupId>
<id>excalibur-thread-api</id>
<name>Excalibur Thread API</name>
- <currentVersion>2.0.0</currentVersion>
<package>org.apache.avalon.excalibur.thread</package>
<inceptionYear>2001</inceptionYear>
<shortDescription>Excalibur Threads API</shortDescription>
Modified: excalibur/trunk/components/thread/impl/project.xml
==============================================================================
--- excalibur/trunk/components/thread/impl/project.xml (original)
+++ excalibur/trunk/components/thread/impl/project.xml Thu Jul 8 05:34:32 2004
@@ -18,12 +18,11 @@
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>excalibur-thread</groupId>
<id>excalibur-thread-impl</id>
<name>Excalibur Thread Implementation</name>
- <currentVersion>2.0.0</currentVersion>
<package>org.apache.avalon.excalibur.thread</package>
<inceptionYear>2001</inceptionYear>
<shortDescription>Excalibur Threads Implementation</shortDescription>
Modified: excalibur/trunk/components/thread/instrumented/project.xml
==============================================================================
--- excalibur/trunk/components/thread/instrumented/project.xml (original)
+++ excalibur/trunk/components/thread/instrumented/project.xml Thu Jul 8 05:34:32 2004
@@ -18,12 +18,11 @@
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<groupId>excalibur-thread</groupId>
<id>excalibur-thread-instrumented</id>
<name>Excalibur Thread Instrumented Implementation</name>
- <currentVersion>2.0.0</currentVersion>
<package>org.apache.avalon.excalibur.thread</package>
<inceptionYear>2001</inceptionYear>
<shortDescription>Excalibur Threads Instrumented Implementation</shortDescription>
Modified: excalibur/trunk/components/thread/project.xml
==============================================================================
--- excalibur/trunk/components/thread/project.xml (original)
+++ excalibur/trunk/components/thread/project.xml Thu Jul 8 05:34:32 2004
@@ -17,11 +17,11 @@
limitations under the License.
-->
<project>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Thread</name>
<groupId>excalibur-thread</groupId>
<id>excalibur-thread</id>
- <currentVersion>2.0.0</currentVersion>
<inceptionYear>2000</inceptionYear>
</project>
Modified: excalibur/trunk/components/xmlutil/project.xml
==============================================================================
--- excalibur/trunk/components/xmlutil/project.xml (original)
+++ excalibur/trunk/components/xmlutil/project.xml Thu Jul 8 05:34:32 2004
@@ -17,11 +17,10 @@
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur XMLUtil</name>
<id>excalibur-xmlutil</id>
- <currentVersion>1.1</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>Components for consuming and producing XML</shortDescription>
<description>
Modified: excalibur/trunk/containerkit/instrument-client/project.xml
==============================================================================
--- excalibur/trunk/containerkit/instrument-client/project.xml (original)
+++ excalibur/trunk/containerkit/instrument-client/project.xml Thu Jul 8 05:34:32 2004
@@ -16,12 +16,11 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Instrument Client</name>
<id>excalibur-instrument-client</id>
<groupId>excalibur-instrument</groupId>
- <currentVersion>1.2</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>Excalibur Instrument client</shortDescription>
<description>
Modified: excalibur/trunk/containerkit/instrument-manager/altrmi/project.xml
==============================================================================
--- excalibur/trunk/containerkit/instrument-manager/altrmi/project.xml (original)
+++ excalibur/trunk/containerkit/instrument-manager/altrmi/project.xml Thu Jul 8 05:34:32 2004
@@ -17,12 +17,11 @@
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<name>Excalibur Instrument Manager Implementation</name>
<id>excalibur-instrument-altrmi</id>
<groupId>excalibur-instrument</groupId>
- <currentVersion>1.2</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>Excalibur Instrument Manager</shortDescription>
<description>
Modified: excalibur/trunk/containerkit/instrument-manager/http/project.xml
==============================================================================
--- excalibur/trunk/containerkit/instrument-manager/http/project.xml (original)
+++ excalibur/trunk/containerkit/instrument-manager/http/project.xml Thu Jul 8 05:34:32 2004
@@ -17,12 +17,11 @@
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<name>Excalibur Instrument Manager Implementation</name>
<id>excalibur-instrument-http</id>
<groupId>excalibur-instrument</groupId>
- <currentVersion>1.2</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>Excalibur Instrument Manager</shortDescription>
<description>
Modified: excalibur/trunk/containerkit/instrument-manager/impl/project.xml
==============================================================================
--- excalibur/trunk/containerkit/instrument-manager/impl/project.xml (original)
+++ excalibur/trunk/containerkit/instrument-manager/impl/project.xml Thu Jul 8 05:34:32 2004
@@ -17,12 +17,11 @@
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<name>Excalibur Instrument Manager Implementation</name>
<id>excalibur-instrument-impl</id>
<groupId>excalibur-instrument</groupId>
- <currentVersion>1.2</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>Excalibur Instrument Manager</shortDescription>
<description>
Modified: excalibur/trunk/containerkit/instrument-manager/spi/project.xml
==============================================================================
--- excalibur/trunk/containerkit/instrument-manager/spi/project.xml (original)
+++ excalibur/trunk/containerkit/instrument-manager/spi/project.xml Thu Jul 8 05:34:32 2004
@@ -17,12 +17,11 @@
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../project-common.xml</extend>
<name>Excalibur Instrument Manager SPI</name>
<id>excalibur-instrument-spi</id>
<groupId>excalibur-instrument</groupId>
- <currentVersion>1.2</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>Excalibur Instrument Manager</shortDescription>
<description>
Modified: excalibur/trunk/containerkit/instrument/project.xml
==============================================================================
--- excalibur/trunk/containerkit/instrument/project.xml (original)
+++ excalibur/trunk/containerkit/instrument/project.xml Thu Jul 8 05:34:32 2004
@@ -16,12 +16,11 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Instrument</name>
<id>excalibur-instrument</id>
<groupId>excalibur-instrument</groupId>
- <currentVersion>1.2</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>Excalibur Instrument</shortDescription>
<description>
Modified: excalibur/trunk/containerkit/lifecycle/project-common.xml
==============================================================================
--- excalibur/trunk/containerkit/lifecycle/project-common.xml (original)
+++ excalibur/trunk/containerkit/lifecycle/project-common.xml Thu Jul 8 05:34:32 2004
@@ -16,12 +16,11 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Lifecycle</name>
<groupId>excalibur-lifecycle</groupId>
<id>excalibur-lifecycle</id>
- <currentVersion>1.1.0</currentVersion>
<inceptionYear>2002</inceptionYear>
<package>org.apache.avalon.lifecycle</package>
Modified: excalibur/trunk/containerkit/lifecycle/project.xml
==============================================================================
--- excalibur/trunk/containerkit/lifecycle/project.xml (original)
+++ excalibur/trunk/containerkit/lifecycle/project.xml Thu Jul 8 05:34:32 2004
@@ -17,11 +17,11 @@
limitations under the License.
-->
<project>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Lifecycle</name>
<groupId>excalibur-lifecycle</groupId>
<id>excalibur-lifecycle</id>
- <currentVersion>1.1.0</currentVersion>
<inceptionYear>2000</inceptionYear>
</project>
Modified: excalibur/trunk/containerkit/logger/project.xml
==============================================================================
--- excalibur/trunk/containerkit/logger/project.xml (original)
+++ excalibur/trunk/containerkit/logger/project.xml Thu Jul 8 05:34:32 2004
@@ -16,11 +16,10 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../project-common.xml</extend>
<name>Excalibur Logger</name>
<id>excalibur-logger</id>
- <currentVersion>1.2</currentVersion>
<inceptionYear>1997</inceptionYear>
<shortDescription>Container utility for implementing LogEnabled/Loggable support.</shortDescription>
<description>
Modified: excalibur/trunk/deprecated/component-examples/instrument-manager/project.xml
==============================================================================
--- excalibur/trunk/deprecated/component-examples/instrument-manager/project.xml (original)
+++ excalibur/trunk/deprecated/component-examples/instrument-manager/project.xml Thu Jul 8 05:34:32 2004
@@ -16,7 +16,7 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../../buildsystem/project-common.xml</extend>
<name>ECM Instrumentation Example</name>
<id>excalibur-component-examples</id>
Modified: excalibur/trunk/deprecated/component-tests/project.xml
==============================================================================
--- excalibur/trunk/deprecated/component-tests/project.xml (original)
+++ excalibur/trunk/deprecated/component-tests/project.xml Thu Jul 8 05:34:32 2004
@@ -16,7 +16,7 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../buildsystem/project-common.xml</extend>
<name>Excalibur Component Manager Tests</name>
<id>excalibur-component-tests</id>
Modified: excalibur/trunk/deprecated/component/project.xml
==============================================================================
--- excalibur/trunk/deprecated/component/project.xml (original)
+++ excalibur/trunk/deprecated/component/project.xml Thu Jul 8 05:34:32 2004
@@ -16,7 +16,7 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../buildsystem/project-common.xml</extend>
<name>Excalibur Component Manager</name>
<id>excalibur-component</id>
Modified: excalibur/trunk/deprecated/event/api/project.xml
==============================================================================
--- excalibur/trunk/deprecated/event/api/project.xml (original)
+++ excalibur/trunk/deprecated/event/api/project.xml Thu Jul 8 05:34:32 2004
@@ -16,7 +16,7 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../../buildsystem/project-common.xml</extend>
<name>Excalibur Event API</name>
<id>excalibur-event-api</id>
Modified: excalibur/trunk/deprecated/event/impl/project.xml
==============================================================================
--- excalibur/trunk/deprecated/event/impl/project.xml (original)
+++ excalibur/trunk/deprecated/event/impl/project.xml Thu Jul 8 05:34:32 2004
@@ -15,7 +15,7 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../../buildsystem/project-common.xml</extend>
<name>Excalibur Event Implementation</name>
<id>excalibur-event-impl</id>
Modified: excalibur/trunk/deprecated/testcase/project.xml
==============================================================================
--- excalibur/trunk/deprecated/testcase/project.xml (original)
+++ excalibur/trunk/deprecated/testcase/project.xml Thu Jul 8 05:34:32 2004
@@ -16,7 +16,7 @@
limitations under the License.
-->
<project>
- <extend>${basedir}/../buildsystem/project-common.xml</extend>
+ <extend>${basedir}/../../buildsystem/project-common.xml</extend>
<name>Excalibur Testcase</name>
<id>excalibur-testcase</id>
Modified: excalibur/trunk/excalibur-trunk.ipr
==============================================================================
--- excalibur/trunk/excalibur-trunk.ipr (original)
+++ excalibur/trunk/excalibur-trunk.ipr Thu Jul 8 05:34:32 2004
@@ -116,22 +116,20 @@
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/_root.iml" filepath="$PROJECT_DIR$/_root.iml" />
- <module fileurl="file://$PROJECT_DIR$/compatibility/compatibility.iml" filepath="$PROJECT_DIR$/compatibility/compatibility.iml" />
- <module fileurl="file://$PROJECT_DIR$/component/component.iml" filepath="$PROJECT_DIR$/component/component.iml" />
- <module fileurl="file://$PROJECT_DIR$/configuration/configuration.iml" filepath="$PROJECT_DIR$/configuration/configuration.iml" />
- <module fileurl="file://$PROJECT_DIR$/datasource/datasource.iml" filepath="$PROJECT_DIR$/datasource/datasource.iml" />
- <module fileurl="file://$PROJECT_DIR$/event/event.iml" filepath="$PROJECT_DIR$/event/event.iml" />
+ <module fileurl="file://$PROJECT_DIR$/deprecated/component/component.iml" filepath="$PROJECT_DIR$/deprecated/component/component.iml" />
+ <module fileurl="file://$PROJECT_DIR$/components/datasource/datasource.iml" filepath="$PROJECT_DIR$/components/datasource/datasource.iml" />
+ <module fileurl="file://$PROJECT_DIR$/deprecated/event/event.iml" filepath="$PROJECT_DIR$/deprecated/event/event.iml" />
<module fileurl="file://$PROJECT_DIR$/fortress/fortress.iml" filepath="$PROJECT_DIR$/fortress/fortress.iml" />
- <module fileurl="file://$PROJECT_DIR$/instrument/instrument.iml" filepath="$PROJECT_DIR$/instrument/instrument.iml" />
- <module fileurl="file://$PROJECT_DIR$/lifecycle/lifecycle.iml" filepath="$PROJECT_DIR$/lifecycle/lifecycle.iml" />
- <module fileurl="file://$PROJECT_DIR$/logger/logger.iml" filepath="$PROJECT_DIR$/logger/logger.iml" />
- <module fileurl="file://$PROJECT_DIR$/monitor/monitor.iml" filepath="$PROJECT_DIR$/monitor/monitor.iml" />
- <module fileurl="file://$PROJECT_DIR$/pool/pool.iml" filepath="$PROJECT_DIR$/pool/pool.iml" />
- <module fileurl="file://$PROJECT_DIR$/sourceresolve/sourceresolve.iml" filepath="$PROJECT_DIR$/sourceresolve/sourceresolve.iml" />
- <module fileurl="file://$PROJECT_DIR$/store/store.iml" filepath="$PROJECT_DIR$/store/store.iml" />
- <module fileurl="file://$PROJECT_DIR$/testcase/testcase.iml" filepath="$PROJECT_DIR$/testcase/testcase.iml" />
- <module fileurl="file://$PROJECT_DIR$/thread/thread.iml" filepath="$PROJECT_DIR$/thread/thread.iml" />
- <module fileurl="file://$PROJECT_DIR$/xmlutil/xmlutil.iml" filepath="$PROJECT_DIR$/xmlutil/xmlutil.iml" />
+ <module fileurl="file://$PROJECT_DIR$/containerkit/instrument/instrument.iml" filepath="$PROJECT_DIR$/containerkit/instrument/instrument.iml" />
+ <module fileurl="file://$PROJECT_DIR$/containerkit/lifecycle/lifecycle.iml" filepath="$PROJECT_DIR$/containerkit/lifecycle/lifecycle.iml" />
+ <module fileurl="file://$PROJECT_DIR$/containerkit/logger/logger.iml" filepath="$PROJECT_DIR$/containerkit/logger/logger.iml" />
+ <module fileurl="file://$PROJECT_DIR$/components/monitor/monitor.iml" filepath="$PROJECT_DIR$/components/monitor/monitor.iml" />
+ <module fileurl="file://$PROJECT_DIR$/components/pool/pool.iml" filepath="$PROJECT_DIR$/components/pool/pool.iml" />
+ <module fileurl="file://$PROJECT_DIR$/components/sourceresolve/sourceresolve.iml" filepath="$PROJECT_DIR$/components/sourceresolve/sourceresolve.iml" />
+ <module fileurl="file://$PROJECT_DIR$/components/store/store.iml" filepath="$PROJECT_DIR$/components/store/store.iml" />
+ <module fileurl="file://$PROJECT_DIR$/deprecated/testcase/testcase.iml" filepath="$PROJECT_DIR$/deprecated/testcase/testcase.iml" />
+ <module fileurl="file://$PROJECT_DIR$/components/thread/thread.iml" filepath="$PROJECT_DIR$/components/thread/thread.iml" />
+ <module fileurl="file://$PROJECT_DIR$/components/xmlutil/xmlutil.iml" filepath="$PROJECT_DIR$/components/xmlutil/xmlutil.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" assert-keyword="true" project-jdk-name="java version "1.4.2_04"" />
Modified: excalibur/trunk/excalibur-trunk.iws
==============================================================================
--- excalibur/trunk/excalibur-trunk.iws (original)
+++ excalibur/trunk/excalibur-trunk.iws Thu Jul 8 05:34:32 2004
@@ -105,7 +105,78 @@
<option name="HIDE_WARNINGS" value="false" />
</component>
<component name="FileEditorManager" split-orientation="vertical" split-proportion="0.5">
- <first-group />
+ <first-group selected-file="file://$PROJECT_DIR$/components/thread/instrumented/project.xml">
+ <entry file="file://$PROJECT_DIR$/components/xmlutil/project.xml" pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="55" column="21" selection-start="1952" selection-end="1952" vertical-scroll-proportion="0.9734513">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/pool/impl/project.xml" pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="45" column="44" selection-start="1537" selection-end="1537" vertical-scroll-proportion="0.79646015">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/thread/project.xml" pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="24" column="0" selection-start="797" selection-end="797" vertical-scroll-proportion="0.42477876">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/thread/api/project.xml" pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="25" column="0" selection-start="826" selection-end="826" vertical-scroll-proportion="0.44247788">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/thread/impl/project.xml" pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="25" column="0" selection-start="838" selection-end="838" vertical-scroll-proportion="0.44247788">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/thread/instrumented/project.xml" pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="25" column="0" selection-start="859" selection-end="859" vertical-scroll-proportion="0.44247788">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/pool/project.xml" pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="24" column="0" selection-start="791" selection-end="791" vertical-scroll-proportion="0.42477876">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/pool/instrumented/project.xml" pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="26" column="0" selection-start="924" selection-end="924" vertical-scroll-proportion="0.460177">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/containerkit/lifecycle/project.xml" pinned="false">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="21" column="0" selection-start="646" selection-end="699" vertical-scroll-proportion="0.37168142">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/pool/project.properties" pinned="false">
+ <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>
+ </first-group>
<second-group />
</component>
<component name="HierarchyBrowserManager">
@@ -120,7 +191,23 @@
</component>
<component name="J2EEProjectPane" />
<component name="PackagesPane" />
- <component name="ProjectPane" />
+ <component name="ProjectPane">
+ <expanded_node url="" module="xmlutil" type="module" />
+ <expanded_node url="" module="datasource" type="module" />
+ <expanded_node url="" module="lifecycle" type="module" />
+ <expanded_node url="file://$PROJECT_DIR$" module="_root" type="directory" />
+ <expanded_node url="file://$PROJECT_DIR$/containerkit/lifecycle/impl" module="lifecycle" type="directory" />
+ <expanded_node url="file://$PROJECT_DIR$/containerkit/lifecycle" module="lifecycle" type="directory" />
+ <expanded_node url="file://$PROJECT_DIR$/components/thread/impl" module="thread" type="directory" />
+ <expanded_node url="file://$PROJECT_DIR$/components/thread" module="thread" type="directory" />
+ <expanded_node url="file://$PROJECT_DIR$/components/thread/instrumented" module="thread" type="directory" />
+ <expanded_node url="file://$PROJECT_DIR$/containerkit" module="_root" type="directory" />
+ <expanded_node url="file://$PROJECT_DIR$/components" module="_root" type="directory" />
+ <expanded_node url="file://$PROJECT_DIR$/components/xmlutil" module="xmlutil" type="directory" />
+ <expanded_node url="" module="thread" type="module" />
+ <expanded_node url="" module="_root" type="module" />
+ <expanded_node url="file://$PROJECT_DIR$/components/thread/api" module="thread" type="directory" />
+ </component>
<component name="ProjectView">
<navigator currentView="ProjectPane" splitterProportion="0.5">
<flattenPackages />
@@ -220,6 +307,24 @@
<option name="SHOW_INHERITED" value="false" />
<option name="HIDE_NOT_PUBLIC" value="false" />
</component>
+ <component name="SvnConfiguration">
+ <option name="USER" value="" />
+ <option name="PASSWORD" value="" />
+ <option name="AUTO_ADD_FILES" value="1" />
+ <option name="AUTO_DEL_FILES" value="1" />
+ <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
+ <option name="SHOW_CHECKIN_OPTIONS" value="true" />
+ <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
+ <option name="LAST_COMMIT_MESSAGE" value="" />
+ <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
+ <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
+ <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
+ <option name="OPTIMIZE_IMPORTS_BEFORE_FILE_COMMIT" value="false" />
+ <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+ <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
+ <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
+ <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
+ </component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
<are-packages-shown value="false" />
@@ -233,8 +338,8 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="-5" y="25" width="1290" height="979" extended-state="0" />
- <editor active="false" />
+ <frame x="-5" y="25" width="1290" height="979" extended-state="6" />
+ <editor active="true" />
<layout>
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
@@ -242,7 +347,7 @@
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
<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="Commander" active="false" anchor="right" auto_hide="false" internal_type="sliding" type="sliding" visible="false" weight="0.4" order="0" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.2353896" order="0" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.22808442" order="0" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.4" order="4" />
<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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32943925" order="1" />
@@ -321,51 +426,107 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/xmlutil/build.xml">
+ <entry file="file://$PROJECT_DIR$/components/thread/maven.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">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/xmlutil/dependencies.list">
+ <entry file="file://$PROJECT_DIR$/containerkit/lifecycle/maven.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="28" column="18" selection-start="1023" selection-end="1023" vertical-scroll-proportion="-3.6907218">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/store/project.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="7" column="33" selection-start="349" selection-end="349" vertical-scroll-proportion="0.12039312">
+ <state line="20" column="0" selection-start="640" selection-end="695" vertical-scroll-proportion="0.3539823">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/buildsystem/jbs/build-reactor.xml">
+ <entry file="file://$PROJECT_DIR$/containerkit/lifecycle/impl/project.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">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/buildsystem/jbs/build-project.xml">
+ <entry file="file://$PROJECT_DIR$/components/pool/api/project.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="676" column="0" selection-start="25454" selection-end="25454" vertical-scroll-proportion="-2.8723404">
+ <state line="19" column="27" selection-start="677" selection-end="677" vertical-scroll-proportion="0.33628318">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/build.xml">
+ <entry file="file://$PROJECT_DIR$/components/xmlutil/project.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="43" column="0" selection-start="1978" selection-end="1978" vertical-scroll-proportion="0.73955774">
+ <state line="55" column="21" selection-start="1952" selection-end="1952" vertical-scroll-proportion="0.9734513">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/consolidate-deps">
+ <entry file="file://$PROJECT_DIR$/components/pool/project.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="24" column="0" selection-start="791" selection-end="791" vertical-scroll-proportion="0.42477876">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/pool/project.properties">
<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$/datasource/gump-build.xml">
+ <entry file="file://$PROJECT_DIR$/containerkit/lifecycle/project.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="21" column="0" selection-start="646" selection-end="699" vertical-scroll-proportion="0.37168142">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/pool/instrumented/project.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="26" column="0" selection-start="924" selection-end="924" vertical-scroll-proportion="0.460177">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/thread/project.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="24" column="0" selection-start="797" selection-end="797" vertical-scroll-proportion="0.42477876">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/pool/impl/project.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="45" column="44" selection-start="1537" selection-end="1537" vertical-scroll-proportion="0.79646015">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/thread/api/project.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="25" column="0" selection-start="826" selection-end="826" vertical-scroll-proportion="0.44247788">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/thread/impl/project.xml">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="25" column="0" selection-start="838" selection-end="838" vertical-scroll-proportion="0.44247788">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/components/thread/instrumented/project.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="27" selection-start="1574" selection-end="1574" vertical-scroll-proportion="0.718398">
+ <state line="25" column="0" selection-start="859" selection-end="859" vertical-scroll-proportion="0.44247788">
<folding />
</state>
</provider>
Modified: excalibur/trunk/fortress/fortress.iml
==============================================================================
--- excalibur/trunk/fortress/fortress.iml (original)
+++ excalibur/trunk/fortress/fortress.iml Thu Jul 8 05:34:32 2004
@@ -107,7 +107,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntryProperties />
</component>
</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: scm-unsubscribe@excalibur.apache.org
For additional commands, e-mail: scm-help@excalibur.apache.org