avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/plugin merlin.properties runtime.xml build.xml copy-all.xsl index.ent maven.xml plugin.jelly plugin.properties project.properties
Date Thu, 22 Apr 2004 01:21:24 GMT
mcconnell    2004/04/21 18:21:24

  Modified:    merlin/plugin build.xml copy-all.xsl index.ent maven.xml
                        plugin.jelly plugin.properties project.properties
  Added:       merlin/plugin merlin.properties runtime.xml
  Log:
  Move the merlin plugin back to merlin directory because you can't build the plugin before
building merlin land you can build the dependent for merlin before building the other plugins.
  
  Revision  Changes    Path
  1.2       +15 -0     avalon/merlin/plugin/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/plugin/build.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- build.xml	22 Mar 2004 10:54:41 -0000	1.1
  +++ build.xml	22 Apr 2004 01:21:23 -0000	1.2
  @@ -1,5 +1,20 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!-- 
   
  + Copyright 2001-2004 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.
  + -->
   
   <project default="warning" name="Gump Build Support" basedir=".">
   
  
  
  
  1.2       +16 -0     avalon/merlin/plugin/copy-all.xsl
  
  Index: copy-all.xsl
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/plugin/copy-all.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- copy-all.xsl	12 Apr 2004 16:01:57 -0000	1.1
  +++ copy-all.xsl	22 Apr 2004 01:21:23 -0000	1.2
  @@ -1,4 +1,20 @@
   <?xml version="1.0"?>
  +<!-- 
  +
  + Copyright 2001-2004 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.
  + -->
   
   <xsl:stylesheet version="1.0"
                   xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
  
  
  
  1.8       +22 -1     avalon/merlin/plugin/index.ent
  
  Index: index.ent
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/plugin/index.ent,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- index.ent	22 Apr 2004 00:15:05 -0000	1.7
  +++ index.ent	22 Apr 2004 01:21:23 -0000	1.8
  @@ -1 +1,22 @@
  -<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
  +<!-- 
  +
  + Copyright 2001-2004 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.
  + -->
  +
  +<!ENTITY % merlin-entities SYSTEM "file:../../versioning/avalon-merlin.ent"> %merlin-entities;
  +<!ENTITY % meta-entities SYSTEM "file:../../versioning/avalon-meta.ent"> %meta-entities;
  +<!ENTITY % repo-entities SYSTEM "file:../../versioning/avalon-repository.ent"> %repo-entities;
  +<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
  +<!ENTITY % logging-entities SYSTEM "file:../../versioning/avalon-logging.ent"> %logging-entities;
  
  
  
  1.9       +36 -9     avalon/merlin/plugin/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/plugin/maven.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- maven.xml	14 Apr 2004 22:18:55 -0000	1.8
  +++ maven.xml	22 Apr 2004 01:21:23 -0000	1.9
  @@ -1,22 +1,49 @@
  +<?xml version="1.0" encoding="UTF-8" ?>
  +<!DOCTYPE project [
  +  <!ENTITY % index SYSTEM "file:index.ent"> %index;
  +]>
  +<!-- 
  +
  + Copyright 2001-2004 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.
  + -->
  +
   <project default="plugin:install" xmlns:ant="jelly:ant">
   
     <postGoal name="java:compile">
  -    <ant:copy file="${maven.repo.local}/${pom.groupId}/properties/merlin.properties"

  -       toDir="${maven.build.dir}/classes" verbose="yes"/>
  +    <ant:copy 
  +      file="merlin.properties" 
  +      toDir="${maven.build.dir}/classes" 
  +      verbose="yes"
  +      filtering="on"
  +    >
  +      <filterset>
  +        <filter token="MERLIN_IMPLEMENTATION" value="&merlin-impl-artifact;"/>
  +        <filter token="LOGGING_IMPLEMENTATION" value="&avalon-logging-logkit-artifact;"/>
  +        <filter token="STANDARD_RUNTIME" value="&avalon-activation-artifact;"/>
  +      </filterset>
  +    </ant:copy>
     </postGoal>
   
     <preGoal name="jar:jar">
  -    <attainGoal name="avalon:generate"/>
  -  </preGoal>
  -  
  -  <goal name="avalon:generate">
       <mkdir dir="${maven.build.dir}/classes"/>
  -    <ant:xslt in="${basedir}/project.xml" out="${maven.build.dir}/classes/project.xml"
  -      style="${basedir}/copy-all.xsl">
  +    <ant:xslt in="${basedir}/runtime.xml" out="${maven.build.dir}/classes/project.xml"
  +      style="${basedir}/copy-all.xsl" force="true">
         <outputproperty name="method" value="xml" />
         <outputproperty name="standalone" value="yes"/>
         <outputproperty name="indent" value="yes"/>
       </ant:xslt>
  -  </goal>
  +  </preGoal>
   
   </project>
  
  
  
  1.6       +18 -2     avalon/merlin/plugin/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/plugin/plugin.jelly,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- plugin.jelly	16 Dec 2003 08:26:17 -0000	1.5
  +++ plugin.jelly	22 Apr 2004 01:21:23 -0000	1.6
  @@ -1,4 +1,20 @@
  -<?xml version="1.0"?>
  +<?xml version="1.0" encoding="UTF-8" ?>
  +<!-- 
  +
  + Copyright 2001-2004 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.
  + -->
   
   <project xmlns:j="jelly:core"
     xmlns:define="jelly:define"
  @@ -11,7 +27,7 @@
     <define:taglib uri="merlin">
       <define:jellybean
         name="kernel"
  -      className="org.apache.avalon.merlin.tools.MerlinBean"
  +      className="org.apache.avalon.plugins.merlin.MerlinBean"
         method="doExecute"/>
     </define:taglib>
   
  
  
  
  1.3       +14 -0     avalon/merlin/plugin/plugin.properties
  
  Index: plugin.properties
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/plugin/plugin.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.properties	8 Dec 2003 15:37:13 -0000	1.2
  +++ plugin.properties	22 Apr 2004 01:21:24 -0000	1.3
  @@ -1,3 +1,17 @@
  +# Copyright 2001-2004 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.
  +
   #----------------------------------------------------------------------
   # merlin system properties
   #----------------------------------------------------------------------
  
  
  
  1.3       +16 -2     avalon/merlin/plugin/project.properties
  
  Index: project.properties
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/plugin/project.properties,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- project.properties	19 Apr 2004 06:15:42 -0000	1.2
  +++ project.properties	22 Apr 2004 01:21:24 -0000	1.3
  @@ -1,6 +1,20 @@
  +# Copyright 2001-2004 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.
   
  +
  +#
  +# Gump integration
   #
  -# gump
   project.name = merlin-plugin
   avalon.buildsystem = ${basedir}/../../buildsystem
  -
  
  
  
  1.1                  avalon/merlin/plugin/merlin.properties
  
  Index: merlin.properties
  ===================================================================
  # Copyright 2004 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.
  
  
  #----------------------------------------------------------------------
  # static defaults for the merlin platform
  #----------------------------------------------------------------------
  
  #
  # The default avalon repository root directory. 
  #
  avalon.home = ${user.home}/.avalon
  
  #
  # merlin system implementation
  merlin.implementation = @MERLIN_IMPLEMENTATION@
  
  #
  # logging implementation
  merlin.logging.implementation = @LOGGING_IMPLEMENTATION@
  
  #
  # runtime implementation
  merlin.runtime.implementation = @STANDARD_RUNTIME@
  
  #
  # server mode
  merlin.server = true
  
  #
  # EOF
  #
  
  
  
  1.1                  avalon/merlin/plugin/runtime.xml
  
  Index: runtime.xml
  ===================================================================
  <?xml version="1.0" encoding="ISO-8859-1"?>
  <!DOCTYPE project [
    <!ENTITY % index SYSTEM "file:index.ent"> %index;
  ]>
  <!-- 
  
   Copyright 2001-2004 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.
   -->
  
  <project>
  
    <groupId>&merlin-plugin-id;</groupId>
    <id>&merlin-plugin-id;</id>
    <currentVersion>&merlin-plugin-version;</currentVersion>
    
    <pomVersion>3</pomVersion>
    <name>Merlin Plugin</name>
    <description>Merlin Plugin for Maven</description>
    <shortDescription>Merlin Plugin for Maven</shortDescription>
    <package>org.apache.avalon.plugins.merlin</package>
    
    <url>http://avalon.apache.org/plugins/merlin/</url>
    <siteDirectory>/www/avalon.apache.org/maven-plugins/merlin</siteDirectory>
  
    <dependencies>
  
      <dependency>
        <groupId>&avalon-repository-id;</groupId>
        <artifactId>&avalon-repository-main-id;</artifactId>
        <version>&avalon-repository-main-version;</version>
        <properties>
          <classloader>root</classloader>
        </properties>
      </dependency>
  
    </dependencies>
  
  </project>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message