Skip to Content.
Sympa Menu

notify-dpml - svn commit: r1565 - in development/main: central/tutorials magic magic/core/src/main/net/dpml/magic/tasks metro metro/activation/api metro/activity/api metro/configuration/impl metro/context/impl metro/parameters/impl metro/system/api metro/system/test metro/testing/testschema planet/facilities/http planet/facilities/http/api planet/facilities/http/blocks/tapestry planet/facilities/http/blocks/webappserver planet/facilities/http/examples/hangman/api planet/facilities/http/examples/hangman/app planet/facilities/http/examples/hangman/game planet/facilities/http/examples/hangman/view transit util

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT netcompartner.com
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r1565 - in development/main: central/tutorials magic magic/core/src/main/net/dpml/magic/tasks metro metro/activation/api metro/activity/api metro/configuration/impl metro/context/impl metro/parameters/impl metro/system/api metro/system/test metro/testing/testschema planet/facilities/http planet/facilities/http/api planet/facilities/http/blocks/tapestry planet/facilities/http/blocks/webappserver planet/facilities/http/examples/hangman/api planet/facilities/http/examples/hangman/app planet/facilities/http/examples/hangman/game planet/facilities/http/examples/hangman/view transit util
  • Date: Sun, 23 Jan 2005 17:32:32 +0100

Author: mcconnell
Date: Sun Jan 23 17:32:32 2005
New Revision: 1565

Modified:
development/main/central/tutorials/ (props changed)
development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
development/main/magic/index.xml
development/main/metro/ (props changed)
development/main/metro/activation/api/ (props changed)
development/main/metro/activity/api/ (props changed)
development/main/metro/configuration/impl/ (props changed)
development/main/metro/context/impl/ (props changed)
development/main/metro/parameters/impl/ (props changed)
development/main/metro/system/api/ (props changed)
development/main/metro/system/test/ (props changed)
development/main/metro/testing/testschema/ (props changed)
development/main/planet/facilities/http/ (props changed)
development/main/planet/facilities/http/api/ (props changed)
development/main/planet/facilities/http/blocks/tapestry/ (props changed)
development/main/planet/facilities/http/blocks/webappserver/ (props
changed)
development/main/planet/facilities/http/examples/hangman/api/ (props
changed)
development/main/planet/facilities/http/examples/hangman/app/ (props
changed)
development/main/planet/facilities/http/examples/hangman/game/ (props
changed)
development/main/planet/facilities/http/examples/hangman/view/ (props
changed)
development/main/transit/index.xml
development/main/util/ (props changed)
Log:
Update the ModuleTask to correct an issue concerning dependent resource
inclusion.

Modified:
development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
==============================================================================
--- development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
(original)
+++ development/main/magic/core/src/main/net/dpml/magic/tasks/ModuleTask.java
Sun Jan 23 17:32:32 2005
@@ -290,8 +290,12 @@
Resource resource = getPrivateIndex().getResource( reference );
if( "module".equals( resource.getInfo().getType() ) )
{
+ //
+ // the resource is a module - add it to the list of modules to
import
+ //
+
String uri = resource.getInfo().getURI();
- if( !modules.contains( uri ) )
+ if( !uri.equals( definition.getInfo().getURI() ) &&
!modules.contains( uri ) )
{
modules.add( uri );
}
@@ -299,34 +303,29 @@
else
{
String module = resource.getModule();
- if(( null != module ) && !"".equals( module ) &&
!modules.contains( module ) )
+ if(( null != module ) && !"".equals( module ) )
{
if( !module.equals( definition.getInfo().getURI() ) )
{
- modules.add( module );
- ResourceRef[] refs =
- resource.getResourceRefs();
- for( int i=0; i<refs.length; i++ )
+ if( !modules.contains( module ) )
{
- ResourceRef ref = refs[i];
- if( ref.getPolicy().matches( Policy.RUNTIME ) )
- {
- expand( definition, ref, list, modules );
- }
+ modules.add( module );
}
}
- }
- else if( !(resource instanceof Definition ) && !list.contains(
resource ) )
- {
- list.add( resource );
- ResourceRef[] refs =
- resource.getResourceRefs();
- for( int i=0; i<refs.length; i++ )
+ else
{
- ResourceRef ref = refs[i];
- if( ref.getPolicy().matches( Policy.RUNTIME ) )
+ if( !(resource instanceof Definition) && !list.contains(
resource ) )
{
- expand( definition, ref, list, modules );
+ list.add( resource );
+ ResourceRef[] refs = resource.getResourceRefs();
+ for( int i=0; i<refs.length; i++ )
+ {
+ ResourceRef ref = refs[i];
+ if( ref.getPolicy().matches( Policy.RUNTIME ) )
+ {
+ expand( definition, ref, list, modules );
+ }
+ }
}
}
}
@@ -425,7 +424,7 @@
}

//-----------------------------------------------------------------------
- // static classes
+ // nested classes
//-----------------------------------------------------------------------

public static class Resolver

Modified: development/main/magic/index.xml
==============================================================================
--- development/main/magic/index.xml (original)
+++ development/main/magic/index.xml Sun Jan 23 17:32:32 2005
@@ -22,7 +22,7 @@
<index key="dpml-magic">

<import index="../transit/index.xml"/>
-
+
<!--
Magic Module
-->
@@ -40,7 +40,7 @@
</dependencies>
<plugins>
<include key="dpml-magic-checkstyle"/>
- <include key="dpml-magic-eclipse"/>
+ <include key="dpml-magic-eclipse"/>
</plugins>
</project>

@@ -239,6 +239,15 @@

<resource>
<info>
+ <group>ant</group>
+ <name>ant</name>
+ <version>1.6.2</version>
+ <type>jar</type>
+ </info>
+ </resource>
+
+ <resource>
+ <info>
<group>checkstyle</group>
<name>checkstyle</name>
<version>3.4</version>

Modified: development/main/transit/index.xml
==============================================================================
--- development/main/transit/index.xml (original)
+++ development/main/transit/index.xml Sun Jan 23 17:32:32 2005
@@ -145,17 +145,4 @@
</dependencies>
</project>

- <!--
- Resources
- -->
-
- <resource>
- <info>
- <group>ant</group>
- <name>ant</name>
- <version>1.6.2</version>
- <type>jar</type>
- </info>
- </resource>
-
</index>



  • svn commit: r1565 - in development/main: central/tutorials magic magic/core/src/main/net/dpml/magic/tasks metro metro/activation/api metro/activity/api metro/configuration/impl metro/context/impl metro/parameters/impl metro/system/api metro/system/test metro/testing/testschema planet/facilities/http planet/facilities/http/api planet/facilities/http/blocks/tapestry planet/facilities/http/blocks/webappserver planet/facilities/http/examples/hangman/api planet/facilities/http/examples/hangman/app planet/facilities/http/examples/hangman/game planet/facilities/http/examples/hangman/view transit util, mcconnell, 01/23/2005

Archive powered by MHonArc 2.6.24.

Top of Page