notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1345 - in trunk/main/metro: . component runtime runtime/src/main/net/dpml/metro/runtime state/impl tools tools/src/main/net/dpml/metro/tools
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1345 - in trunk/main/metro: . component runtime runtime/src/main/net/dpml/metro/runtime state/impl tools tools/src/main/net/dpml/metro/tools
- Date: Sat, 8 Apr 2006 20:38:52 +0200
Author: mcconnell
Date: 2006-04-08 20:38:25 +0200 (Sat, 08 Apr 2006)
New Revision: 1345
Removed:
trunk/main/metro/component/build.xml
Modified:
trunk/main/metro/module.xml
trunk/main/metro/runtime/build.xml
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
trunk/main/metro/state/impl/build.xml
trunk/main/metro/tools/build.xml
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
Log:
housekeeping
Deleted: trunk/main/metro/component/build.xml
===================================================================
--- trunk/main/metro/component/build.xml 2006-04-08 18:12:41 UTC (rev
1344)
+++ trunk/main/metro/component/build.xml 2006-04-08 18:38:25 UTC (rev
1345)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Copyright 2005 Stephen J. McConnell
-
- 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.
--->
-
-<project name="dpml-metro-component"
- xmlns:transit="antlib:net.dpml.transit"
- xmlns:x="dpml:depot"
- default="install">
-
- <transit:import uri="local:template:dpml/tools/standard"/>
-
- <!--
- <target name="init" depends="standard.init">
- <x:filter feature="name" token="NAME"/>
- <x:filter feature="version" token="VERSION"/>
- <x:filter feature="group" token="GROUP"/>
- <x:filter key="dpml-metro-runtime" feature="uri" type="part"
token="PART-HANDLER-URI" />
- <x:filter feature="uri" type="jar" token="PART-BUILDER-URI" />
- </target>
- -->
-
-</project>
-
-
Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-04-08 18:12:41 UTC (rev 1344)
+++ trunk/main/metro/module.xml 2006-04-08 18:38:25 UTC (rev 1345)
@@ -11,6 +11,9 @@
</project>
<project name="dpml-state-impl" basedir="state/impl">
+ <filters>
+ <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state"/>
+ </filters>
<types>
<type id="jar"/>
</types>
@@ -89,6 +92,13 @@
</project>
<project name="dpml-metro-runtime" basedir="runtime">
+ <filters>
+ <feature token="PART-HANDLER-URI" id="uri" type="part"/>
+ <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state"/>
+ <feature token="PART-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part"/>
+ <feature token="TYPE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-type"/>
+ <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component"/>
+ </filters>
<types>
<type id="jar"/>
<part:plugin alias="true"
class="net.dpml.metro.runtime.CompositionController">
@@ -108,6 +118,12 @@
</project>
<project name="dpml-metro-tools" basedir="tools">
+ <filters>
+ <feature token="PART-BUILDER-URI" id="uri" type="part"/>
+ <feature token="PART-HANDLER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
+ <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component"/>
+ <feature token="STRATEGY-BUILDER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
+ </filters>
<types>
<type id="jar"/>
<part:resource alias="true" urn="dpml:metro"
Modified: trunk/main/metro/runtime/build.xml
===================================================================
--- trunk/main/metro/runtime/build.xml 2006-04-08 18:12:41 UTC (rev 1344)
+++ trunk/main/metro/runtime/build.xml 2006-04-08 18:38:25 UTC (rev 1345)
@@ -24,15 +24,6 @@
<transit:import uri="local:template:dpml/tools/standard"/>
- <target name="init" depends="standard.init">
- <x:filter type="part" feature="uri" token="PART-HANDLER-URI" />
- <x:filter type="xsd" feature="uri" token="STATE-XSD-URI"
ref="dpml/lang/dpml-state"/>
- <x:filter type="xsd" feature="uri" token="PART-XSD-URI"
ref="dpml/lang/dpml-part"/>
- <x:filter type="xsd" feature="uri" token="TYPE-XSD-URI"
ref="dpml/lang/dpml-type"/>
- <x:filter type="xsd" feature="uri" token="COMPONENT-XSD-URI"
ref="dpml/lang/dpml-component"/>
- <x:filter type="xsd" feature="uri" token="COMPONENT-NAMESPACE-URI"
ref="dpml/lang/dpml-component"/>
- </target>
-
<target name="build" depends="standard.build">
<rmic base="${project.target.classes.main.dir}"
classpathref="project.compile.path">
<include name="**/DefaultComponentModel.class"/>
Modified:
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
===================================================================
---
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
2006-04-08 18:12:41 UTC (rev 1344)
+++
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
2006-04-08 18:38:25 UTC (rev 1345)
@@ -64,9 +64,7 @@
//--------------------------------------------------------------------
// static
//--------------------------------------------------------------------
-
- private static final String COMPONENT_NAMESPACE_URI =
"@COMPONENT-NAMESPACE-URI@";
-
+
/**
* Static URI of this controller.
*/
Modified: trunk/main/metro/state/impl/build.xml
===================================================================
--- trunk/main/metro/state/impl/build.xml 2006-04-08 18:12:41 UTC (rev
1344)
+++ trunk/main/metro/state/impl/build.xml 2006-04-08 18:38:25 UTC (rev
1345)
@@ -23,10 +23,6 @@
<transit:import uri="local:template:dpml/tools/standard"/>
- <target name="init" depends="standard.init">
- <filter token="STATE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-state#1.0"/>
- </target>
-
<target name="build" depends="standard.build">
<rmic base="${project.target.classes.main.dir}"
classpathref="project.compile.path">
<include name="**/DefaultStateListener.class"/>
Modified: trunk/main/metro/tools/build.xml
===================================================================
--- trunk/main/metro/tools/build.xml 2006-04-08 18:12:41 UTC (rev 1344)
+++ trunk/main/metro/tools/build.xml 2006-04-08 18:38:25 UTC (rev 1345)
@@ -24,13 +24,6 @@
<transit:import uri="local:template:dpml/tools/standard"/>
- <target name="init" depends="standard.init">
- <x:filter feature="uri" type="part" token="PART-BUILDER-URI" />
- <x:filter key="dpml-metro-runtime" feature="uri" type="part"
token="PART-HANDLER-URI" />
- <x:filter ref="dpml/lang/dpml-component" feature="uri" type="xsd"
token="COMPONENT-XSD-URI" />
- <x:filter key="dpml-metro-runtime" feature="uri" type="part"
token="STRATEGY-BUILDER-URI" />
- </target>
-
<target name="install" depends="standard.install">
<property name="prefs.metro" location="${dpml.prefs}/dpml/metro"/>
<mkdir dir="${prefs.metro}/"/>
Modified:
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
===================================================================
---
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
2006-04-08 18:12:41 UTC (rev 1344)
+++
trunk/main/metro/tools/src/main/net/dpml/metro/tools/ComponentBuilderTask.java
2006-04-08 18:38:25 UTC (rev 1345)
@@ -50,9 +50,6 @@
import net.dpml.transit.monitor.LoggingAdapter;
-//import net.dpml.lang.Strategy;
-//import net.dpml.lang.PartDirective;
-
import net.dpml.tools.tasks.PartTask;
import org.apache.tools.ant.BuildException;
@@ -76,7 +73,6 @@
private URI m_uri;
private String m_key;
private boolean m_embedded = false;
- //private URI m_extends;
private String m_name;
private String m_classname;
private LifestylePolicy m_lifestyle;
@@ -229,20 +225,6 @@
}
/**
- * Execute the task.
- */
- /*
- public void execute()
- {
- ClassLoader classloader = createClassLoader();
- Thread.currentThread().setContextClassLoader( classloader );
- Strategy strategy = createStrategy( classloader );
- setStrategy( strategy );
- super.execute();
- }
- */
-
- /**
* Build the plugin definition.
* @param resource the project resource definition
* @return the part definition
@@ -269,33 +251,6 @@
}
/**
- * Create a component strategy.
- * @param classloader the classloader
- * @return the component directive
- */
- /*
- public Strategy createStrategy( ClassLoader classloader )
- {
- try
- {
- PartDirective directive = new PartDirective( PART_HANDLER_URI );
- ComponentDirective profile = buildComponentDirective(
classloader );
- return new Strategy( STRATEGY_BUILDER_URI, directive, profile,
m_alias );
- }
- catch( BuildException e )
- {
- throw e;
- }
- catch( Exception e )
- {
- final String error =
- "Internal error while attempting to build the part.";
- throw new BuildException( error, e, getLocation() );
- }
- }
- */
-
- /**
* Return the runtime classloader.
* @return the classloader
*/
@@ -309,62 +264,6 @@
return new AntClassLoader( parentClassLoader, project, path, true );
}
- /*
- private File getOutputFile()
- {
- if( null != m_output )
- {
- return m_output;
- }
- else
- {
- return getDefaultOutputFile();
- }
- }
-
- private File getDefaultOutputFile()
- {
- if( m_embedded )
- {
- String classname = getClassname();
- String path = getEmbeddedResourcePath( classname );
- return getEmbeddedOutputFile( path );
- }
- else
- {
- return getPartOutputFile();
- }
- }
- */
-
- /**
- * Return the embedded reosurce path.
- * @param classname the component classname
- * @return the resource path
- */
- /*
- public String getEmbeddedResourcePath( String classname )
- {
- String path = classname.replace( '.', '/' );
- String filename = path + ".xprofile";
- return filename;
- }
- */
-
- /**
- * Return the embedded output file.
- * @param filename the filename
- * @return the embedded output file
- */
- /*
- public File getEmbeddedOutputFile( String filename )
- {
- File classes = getContext().getTargetClassesMainDirectory();
- File destination = new File( classes, filename );
- return destination;
- }
- */
-
//---------------------------------------------------------------------
// Builder
//---------------------------------------------------------------------
@@ -467,38 +366,6 @@
String id = getName( type.getInfo().getName() );
log( "creating [" + id + "] using [" + classname + "]" );
- //if( null == m_extends )
- //{
- m_profile = new ComponentDirective( id, classname );
- //}
- //else
- //{
- // try
- // {
- // Directive part = getController().loadDirective( m_extends
);
- // if( part instanceof ComponentDirective )
- // {
- // m_profile = (ComponentDirective) part;
- // }
- // else
- // {
- // final String error =
- // "Super-part is not an instance of "
- // + ComponentDirective.class.getName();
- // throw new BuildException( error );
- // }
- // }
- // catch( Throwable e )
- // {
- // final String error =
- // "Unable to resolve component super-part ["
- // + m_extends
- // + "] due to: "
- // + e.getMessage();
- // throw new BuildException( error, e, getLocation() );
- // }
- //}
-
LifestylePolicy lifestyle = getLifestylePolicy();
CollectionPolicy collection = getCollectionPolicy( type );
ActivationPolicy activation = getActivationPolicy();
@@ -751,14 +618,14 @@
public static final URI PART_HANDLER_URI = setupURI(
"@PART-HANDLER-URI@" );
/**
- * Constant builder uri.
+ * Constant strategy builder uri.
*/
- public static final URI PART_BUILDER_URI = setupURI(
"@PART-BUILDER-URI@" );
+ public static final URI STRATEGY_BUILDER_URI = setupURI(
"@STRATEGY-BUILDER-URI@" );
/**
- * Constant strategy builder uri.
+ * Constant builder uri.
*/
- public static final URI STRATEGY_BUILDER_URI = setupURI(
"@STRATEGY-BUILDER-URI@" );
+ public static final URI PART_BUILDER_URI = setupURI(
"@PART-BUILDER-URI@" );
/**
* Utility function to create a static uri.
- r1345 - in trunk/main/metro: . component runtime runtime/src/main/net/dpml/metro/runtime state/impl tools tools/src/main/net/dpml/metro/tools, mcconnell at BerliOS, 04/08/2006
Archive powered by MHonArc 2.6.24.