Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1393 - in development/main: . magic/bootstrap magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/core magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/project magic/core/src/main/net/dpml/magic/tasks metro/composition/test/src/main/net/dpml/composition/test metro/unit/src/main/net/dpml/metro/unit planet/facilities transit/handler/etc/setup transit/handler/etc/setup/authority transit/plugin/etc/bin

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: niclas AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1393 - in development/main: . magic/bootstrap magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/core magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/project magic/core/src/main/net/dpml/magic/tasks metro/composition/test/src/main/net/dpml/composition/test metro/unit/src/main/net/dpml/metro/unit planet/facilities transit/handler/etc/setup transit/handler/etc/setup/authority transit/plugin/etc/bin
  • Date: Thu, 06 Jan 2005 11:27:10 +0100

Author: niclas
Date: Thu Jan 6 11:27:10 2005
New Revision: 1393

Modified:
development/main/bootstrap.xml
development/main/magic/bootstrap/build.xml

development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/MainTask.java
development/main/magic/core/build.xml
development/main/magic/core/src/main/net/dpml/magic/Index.java
development/main/magic/core/src/main/net/dpml/magic/model/Definition.java
development/main/magic/core/src/main/net/dpml/magic/project/Context.java

development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
development/main/magic/core/src/main/net/dpml/magic/tasks/package.html

development/main/metro/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java

development/main/metro/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
development/main/planet/facilities/index.xml
development/main/setup.properties
development/main/setup.xml
development/main/transit/handler/etc/setup/README.TXT
development/main/transit/handler/etc/setup/authority/cache.properties
development/main/transit/handler/etc/setup/authority/hosts.xml
development/main/transit/plugin/etc/bin/transit
development/main/transit/plugin/etc/bin/transit.bat
development/main/transit/plugin/etc/bin/transit.sh
Log:
Changed the location of the cache from ${dpml.home}/main to
${dpml.home}/cache.

Modified: development/main/bootstrap.xml
==============================================================================
--- development/main/bootstrap.xml (original)
+++ development/main/bootstrap.xml Thu Jan 6 11:27:10 2005
@@ -200,7 +200,7 @@
debug="true">
<classpath>
<pathelement location="${target.classes.dir}"/>
- <pathelement
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
+ <pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
</classpath>
</javac>
</target>
@@ -218,7 +218,7 @@
<classpath>
<pathelement location="${target.classes.dir}"/>
<pathelement location="${target.test-classes.dir}"/>
- <pathelement
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
+ <pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>
@@ -236,9 +236,9 @@
Install any deliverables under the project cache relative to the project
group path.
-->
<target name="install" depends="package,test">
- <echo>Installing to: ${dpml.home}/main/${project.group}</echo>
- <mkdir dir="${dpml.home}/main/${project.group}"/>
- <copy toDir="${dpml.home}/main/${project.group}">
+ <echo>Installing to: ${dpml.home}/cache/${project.group}</echo>
+ <mkdir dir="${dpml.home}/cache/${project.group}"/>
+ <copy toDir="${dpml.home}/cache/${project.group}">
<fileset dir="${target.deliverables.dir}"/>
</copy>
</target>

Modified: development/main/magic/bootstrap/build.xml
==============================================================================
--- development/main/magic/bootstrap/build.xml (original)
+++ development/main/magic/bootstrap/build.xml Thu Jan 6 11:27:10 2005
@@ -35,7 +35,7 @@
<target name="build" depends="prepare">
<javac srcdir="target/build/main" destdir="target/classes" debug="true">
<classpath>
- <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
</classpath>
</javac>
</target>
@@ -46,7 +46,7 @@
destdir="target/test-classes"
debug="true">
<classpath>
- <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
<pathelement location="target/classes"/>
</classpath>
</javac>
@@ -59,7 +59,7 @@
<classpath>
<pathelement location="target/classes"/>
<pathelement location="target/test-classes"/>
- <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
</classpath>
<formatter type="plain"/>
<batchtest fork="yes" todir="target/test-reports">

Modified:
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/MainTask.java
==============================================================================
---
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/MainTask.java
(original)
+++
development/main/magic/bootstrap/src/main/net/dpml/magic/bootstrap/MainTask.java
Thu Jan 6 11:27:10 2005
@@ -37,7 +37,7 @@
import net.dpml.transit.repository.StandardLoader;

/**
- * Task that initializes the Transit sub-system duruing which a transit
+ * Task that initializes the Transit sub-system during which a transit
* is assigned to the current project. In addition the initization
procedures
* establishes a set of ant properties enabling convenient script based
access
* to DPML dirctories.
@@ -141,7 +141,7 @@
File home = Transit.DPML_HOME;
File templates = new File( home, "templates" );
File docs = new File( home, "docs" );
- File cache = new File( home, "main" );
+ File cache = new File( home, "cache" );
updateProperty( project, "dpml.home", home.getAbsolutePath() );
updateProperty( project, "dpml.templates",
templates.getAbsolutePath() );
updateProperty( project, "dpml.docs", docs.getAbsolutePath() );

Modified: development/main/magic/core/build.xml
==============================================================================
--- development/main/magic/core/build.xml (original)
+++ development/main/magic/core/build.xml Thu Jan 6 11:27:10 2005
@@ -49,15 +49,15 @@
<target name="build" depends="prepare">
<javac srcdir="target/build/main" destdir="target/classes" debug="true">
<classpath>
- <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- <pathelement
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
</classpath>
</javac>
<taskdef name="export" classname="net.dpml.magic.tasks.ExportTask">
<classpath>
- <pathelement
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
- <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- <pathelement
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
+ <pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
<pathelement location="target/classes"/>
</classpath>
</taskdef>
@@ -82,9 +82,9 @@
destdir="target/test-classes"
debug="true">
<classpath>
- <pathelement
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
- <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- <pathelement
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
+ <pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
<pathelement location="target/classes"/>
</classpath>
</javac>
@@ -97,9 +97,9 @@
<classpath>
<pathelement location="target/classes"/>
<pathelement location="target/test-classes"/>
- <pathelement
location="${dpml.home}/main/dpml/transit/jars/${dpml-transit-handler.filename}"/>
- <pathelement
location="${dpml.home}/main/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
- <pathelement
location="${dpml.home}/main/junit/jars/${junit-filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/transit/jars/${dpml-transit-handler.filename}"/>
+ <pathelement
location="${dpml.home}/cache/dpml/magic/jars/${dpml-magic-bootstrap.filename}"/>
+ <pathelement
location="${dpml.home}/cache/junit/jars/${junit-filename}"/>
</classpath>
<formatter type="plain"/>
<formatter type="xml"/>

Modified: development/main/magic/core/src/main/net/dpml/magic/Index.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/Index.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/Index.java Thu
Jan 6 11:27:10 2005
@@ -166,13 +166,14 @@

public File getCacheDirectory()
{
- return new File( getHomeDirectory(), "main" ); // <--------------
FIXME
+ String cacheDir = getProject().getProperty( "dpml.cache" );
+ return new File( cacheDir );
}

public File getDocsDirectory()
{
- File docs = new File( getHomeDirectory(), "docs" );
- return docs;
+ String docsDir = getProject().getProperty( "dpml.docs" );
+ return new File( docsDir );
}

public Repository getRepository()

Modified:
development/main/magic/core/src/main/net/dpml/magic/model/Definition.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/model/Definition.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/model/Definition.java
Thu Jan 6 11:27:10 2005
@@ -43,7 +43,7 @@

/**
* Creation of a new definition relative to a supplied home, a unique
project key,
- * project base directory and path, statatory info, gump extras,
depednecies and
+ * project base directory and path, statatory info, gump extras,
dependencies and
* plugin assumptions.
*
* @param index the index into which this project is bound

Modified:
development/main/magic/core/src/main/net/dpml/magic/project/Context.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/project/Context.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/project/Context.java
Thu Jan 6 11:27:10 2005
@@ -158,19 +158,6 @@
m_build = new File( m_target, "build" );
m_temp = new File( m_target, "temp" );

- //
- // declare system properties
- //
-
- File home = getIndex().getHomeDirectory();
- File cache = getIndex().getCacheDirectory();
- File templates = new File( home, "templates" );
- File themes = new File( home, "themes" );
-
- updateProperty( project, "project.cache", cache.toString() );
- updateProperty( project, "project.templates", templates.toString() );
- updateProperty( project, "project.themes", themes.toString() );
- updateProperty( project, "project.templates", templates.toString() );
}

//-------------------------------------------------------------

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
==============================================================================
---
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
(original)
+++
development/main/magic/core/src/main/net/dpml/magic/tasks/JUnitTestTask.java
Thu Jan 6 11:27:10 2005
@@ -65,7 +65,8 @@
public static final String HALT_ON_FAILURE_KEY =
"project.test.halt-on-failure";
public static final boolean HALT_ON_FAILURE_VALUE = true;

- public static final String CACHE_PATH_KEY = "project.cache";
+ public static final String CACHE_PATH_KEY = "dpml.cache";
+
public static final String WORK_DIR_KEY = "project.dir";

private static final String ERROR_KEY = "project.test.error";

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/package.html
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/package.html
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/package.html
Thu Jan 6 11:27:10 2005
@@ -1,7 +1,9 @@

<body>
<p>
-Core task providing the main project build functionality relative to the
common system model of projects and their transitive relationships with local
and external resources.
+Core task providing the main project build functionality relative to the
common
+system model of projects and their transitive relationships with local and
+external resources.
</p>
</body>


Modified:
development/main/metro/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java
==============================================================================
---
development/main/metro/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java
(original)
+++
development/main/metro/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java
Thu Jan 6 11:27:10 2005
@@ -57,10 +57,8 @@
//------------------------------------------------------------------

/**
- * Creation of a new composition context with a cache directory assigned
- * to the value returned from the project.cache system
- * property and relative path references resolved relative to the
project.dir
- * system property.
+ * Creation of a new composition context with a relative path references
+ * resolved relative to the project.dir system property.
*
* @return the composition context
*/
@@ -71,10 +69,8 @@
}

/**
- * Creation of a new composition context with a cache directory assigned
- * to the value returned from the project.cache system
- * property and relative path references resolved relative to the
project.dir
- * system property.
+ * Creation of a new composition context with a relative path references
+ * resolved relative to the project.dir system property.
*
* @param map a map of supplimentary factory criteria that will be
* applied to the composition context factory

Modified:
development/main/metro/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
==============================================================================
---
development/main/metro/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
(original)
+++
development/main/metro/unit/src/main/net/dpml/metro/unit/CompositionTestCase.java
Thu Jan 6 11:27:10 2005
@@ -63,10 +63,8 @@
//------------------------------------------------------------------

/**
- * Creation of a new composition context with a cache directory assigned
- * to the value returned from the project.cache system
- * property and relative path references resolved relative to the
project.dir
- * system property.
+ * Creation of a new composition context with a relative path references
+ * resolved relative to the project.dir system property.
*/
protected void setupCompositionRoot()
throws Exception
@@ -78,10 +76,8 @@
}

/**
- * Creation of a new composition context with a cache directory assigned
- * to the value returned from the project.cache system
- * property and relative path references resolved relative to the
project.dir
- * system property.
+ * Creation of a new composition context with a relative path references
+ * resolved relative to the project.dir system property.
*
* @param map a map of supplimentary factory criteria that will be
* applied to the composition context factory

Modified: development/main/planet/facilities/index.xml
==============================================================================
--- development/main/planet/facilities/index.xml (original)
+++ development/main/planet/facilities/index.xml Thu Jan 6 11:27:10
2005
@@ -74,6 +74,9 @@
<version>5.1.1</version>
<type>jar</type>
</info>
+ <dependencies>
+ <include key="servletapi" />
+ </dependencies>
</resource>

<resource>

Modified: development/main/setup.properties
==============================================================================
--- development/main/setup.properties (original)
+++ development/main/setup.properties Thu Jan 6 11:27:10 2005
@@ -4,7 +4,7 @@
# for the setup of the DPML home directory, cache and related resources.
#

-dpml.host = http://www.dpml.net
+dpml.host = http://www.dpml.net/repository

# dpml.proxy.host =
# dpml.proxy.port =

Modified: development/main/setup.xml
==============================================================================
--- development/main/setup.xml (original)
+++ development/main/setup.xml Thu Jan 6 11:27:10 2005
@@ -47,7 +47,7 @@

#----------------------------------------------------------------------------------
</echo>
<mkdir dir="${dpml.home}"/>
- <property name="dpml.cache" value="${dpml.home}/main"/>
+ <property name="dpml.cache" value="${dpml.home}/cache"/>
<echo message="Using cache: ${dpml.cache}"/>
<mkdir dir="${dpml.cache}"/>
<property name="dpml.docs" value="${dpml.home}/docs"/>
@@ -73,12 +73,12 @@
# Installing JUnit

#----------------------------------------------------------------------------------
</echo>
- <mkdir dir="${dpml.home}/main/junit/jars"/>
+ <mkdir dir="${dpml.home}/cache/junit/jars"/>
<get src="${junit.url}" usetimestamp="true"
- dest="${dpml.home}/main/junit/jars/${junit.jar}"/>
+ dest="${dpml.home}/cache/junit/jars/${junit.jar}"/>
<mkdir dir="${user.home}/.ant/lib"/>
<copy toDir="${user.home}/.ant/lib">
- <fileset dir="${dpml.home}/main/junit/jars">
+ <fileset dir="${dpml.home}/cache/junit/jars">
<include name="${junit.jar}"/>
</fileset>
</copy>

Modified: development/main/transit/handler/etc/setup/README.TXT
==============================================================================
--- development/main/transit/handler/etc/setup/README.TXT (original)
+++ development/main/transit/handler/etc/setup/README.TXT Thu Jan 6
11:27:10 2005
@@ -1,21 +1,23 @@
-
-The hosts configuation files when full expanded contains multiple <host>
-element entries. The following example shows a host element with all
-elements declared:
-
-<hosts>
-
- <host href="http://www.dpml.net"; enabled="true">
- <priority>20</priority>
- <policy>fast</policy>
- <trusted>false</trusted>
- <class>net.dpml.transit.artifact.MavenResourceHost</class>
- <index href="index.idx">
- <credentials>
- <username>fred</username>
- <password>blogs</password>
- </credentials>
- </host>
-
-</hosts>
-
+
+The hosts configuation files when full expanded contains multiple <host>
+element entries. The following example shows a host element with all
+elements declared:
+
+<hosts>
+
+ <host href="http://www.dpml.net/repository"; enabled="true">
+ <priority>20</priority>
+ <policy>fast</policy>
+ <trusted>false</trusted>
+ <class>net.dpml.transit.artifact.ClassicResourceHost</class>
+ <index href="index.idx">
+ <credentials>
+ <username>fred</username>
+ <password>blogs</password>
+ </credentials>
+ <scheme>basic</scheme> <!-- The HTTP authentication scheme -->
+ <prompt>Repository</prompt> <!-- The HTTP Realm/prompt -->
+ </host>
+
+</hosts>
+

Modified:
development/main/transit/handler/etc/setup/authority/cache.properties
==============================================================================
--- development/main/transit/handler/etc/setup/authority/cache.properties
(original)
+++ development/main/transit/handler/etc/setup/authority/cache.properties
Thu Jan 6 11:27:10 2005
@@ -1,5 +1,5 @@
# The location of the cache system
-dpml.transit.cache.location=${dpml.home}/main
+dpml.transit.cache.location=${dpml.home}/cache

# The class that implements the cache handler
dpml.transit.cache.class=net.dpml.transit.artifact.FileCacheHandler

Modified: development/main/transit/handler/etc/setup/authority/hosts.xml
==============================================================================
--- development/main/transit/handler/etc/setup/authority/hosts.xml
(original)
+++ development/main/transit/handler/etc/setup/authority/hosts.xml Thu
Jan 6 11:27:10 2005
@@ -7,6 +7,12 @@
<trusted>true</trusted>
</host>

+ <!-- Enable later, and remove the www.dpml.net host
+ <host href="http://repository.dpml.net/artifacts";>
+ <priority>20</priority>
+ </host>
+ -->
+
<host href="http://www.dpml.net/repository";>
<priority>20</priority>
</host>

Modified: development/main/transit/plugin/etc/bin/transit
==============================================================================
--- development/main/transit/plugin/etc/bin/transit (original)
+++ development/main/transit/plugin/etc/bin/transit Thu Jan 6 11:27:10
2005
@@ -20,7 +20,7 @@
export DPML_HOME="$HOME/.dpml"
fi
if [ ! "$DPML_CACHE" ]; then
- export DPML_CACHE="$DPML_HOME/main"
+ export DPML_CACHE="$DPML_HOME/cache"
fi

# Checking for JAVA_HOME is required on *nix due

Modified: development/main/transit/plugin/etc/bin/transit.bat
==============================================================================
--- development/main/transit/plugin/etc/bin/transit.bat (original)
+++ development/main/transit/plugin/etc/bin/transit.bat Thu Jan 6 11:27:10
2005
@@ -14,7 +14,7 @@

:SET_METRO
if "%DPML_HOME%" == "" set DPML_HOME=%USERPROFILE%\.dpml
-if "%DPML_CACHE%" == "" set DPML_CACHE=%DPML_HOME%\main
+if "%DPML_CACHE%" == "" set DPML_CACHE=%DPML_HOME%\cache
if "%TRANSIT_PLUGIN%" == "" set TRANSIT_PLUGIN=@TRANSIT-PLUGIN-URI@

set CMD_LINE_ARGS=%*

Modified: development/main/transit/plugin/etc/bin/transit.sh
==============================================================================
--- development/main/transit/plugin/etc/bin/transit.sh (original)
+++ development/main/transit/plugin/etc/bin/transit.sh Thu Jan 6 11:27:10
2005
@@ -43,7 +43,7 @@
export DPML_HOME="$HOME/.dpml"
fi
if [ ! "$DPML_CACHE" ]; then
- export DPML_CACHE="$DPML_HOME/main"
+ export DPML_CACHE="$DPML_HOME/cache"
fi





  • svn commit: r1393 - in development/main: . magic/bootstrap magic/bootstrap/src/main/net/dpml/magic/bootstrap magic/core magic/core/src/main/net/dpml/magic magic/core/src/main/net/dpml/magic/model magic/core/src/main/net/dpml/magic/project magic/core/src/main/net/dpml/magic/tasks metro/composition/test/src/main/net/dpml/composition/test metro/unit/src/main/net/dpml/metro/unit planet/facilities transit/handler/etc/setup transit/handler/etc/setup/authority transit/plugin/etc/bin, niclas, 01/06/2005

Archive powered by MHonArc 2.6.24.

Top of Page