You are viewing a plain text version of this content. The canonical link for it is here.
Posted to graffito-commits@incubator.apache.org by ta...@apache.org on 2005/06/13 23:06:52 UTC

svn commit: r190525 - in /incubator/graffito/trunk: api/locator.ent api/locator.path api/project.xml components/locator.ent components/locator.path components/project.xml

Author: taylor
Date: Mon Jun 13 16:06:50 2005
New Revision: 190525

URL: http://svn.apache.org/viewcvs?rev=190525&view=rev
Log:
use locator entities to find jetspeed and bridges versions of dependencies
note: all other dependencies should be handled in a similar manner where possible

Added:
    incubator/graffito/trunk/api/locator.ent
    incubator/graffito/trunk/api/locator.path
    incubator/graffito/trunk/components/locator.ent
    incubator/graffito/trunk/components/locator.path
Modified:
    incubator/graffito/trunk/api/project.xml
    incubator/graffito/trunk/components/project.xml

Added: incubator/graffito/trunk/api/locator.ent
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/api/locator.ent?rev=190525&view=auto
==============================================================================
--- incubator/graffito/trunk/api/locator.ent (added)
+++ incubator/graffito/trunk/api/locator.ent Mon Jun 13 16:06:50 2005
@@ -0,0 +1,2 @@
+<!-- derive locator.ent from parent -->
+<!ENTITY % locator-ent SYSTEM "file:../locator.ent"> %locator-ent;

Added: incubator/graffito/trunk/api/locator.path
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/api/locator.path?rev=190525&view=auto
==============================================================================
--- incubator/graffito/trunk/api/locator.path (added)
+++ incubator/graffito/trunk/api/locator.path Mon Jun 13 16:06:50 2005
@@ -0,0 +1 @@
+../
\ No newline at end of file

Modified: incubator/graffito/trunk/api/project.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/api/project.xml?rev=190525&r1=190524&r2=190525&view=diff
==============================================================================
--- incubator/graffito/trunk/api/project.xml (original)
+++ incubator/graffito/trunk/api/project.xml Mon Jun 13 16:06:50 2005
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
-->
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
]>
<!--
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.
-->
 <project>
 <extend>${basedir}/../project.xml</extend>
  <pomVersion>3</pomVersion>
  <id>graffito-api</id>
  <groupId>graffito</groupId>
  <name>Graffito Core API</name>
  <currentVersion>1.0-a1-dev</currentVersion>
  <package>org.apache.portals.graffito</package>
  <description>
	  Core API for the Graffito object model and the components services.
  </description>
  <shortDescription>Graffito API </shortDescription>

<repository>
     <connection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/api</connection>
     <developerConnection>scm:subversion:https://svn.apache.org/repos/asf/incubator/graffito/trunk/api</developerConnection>
     <url>http://svn.apache.org/viewcvs</url>
-  </repository>
  
  <dependencies>
    <dependency>
      <id>jetspeed-api</id>
      <groupId>jetspeed2</groupId>
      <version>2.0-M3-dev</version>
    </dependency>
	
  </dependencies>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
     <resources>
      <resource>
        <directory>${basedir}/src/java</directory>
        <excludes>
          <exclude>**/*.java</exclude>
        </excludes>
      </resource>
    </resources>
    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
    <unitTest>
       <includes>
        <include>**/Test*.java</include>
      </includes>
      <excludes>
      </excludes>
      <resources>
        <resource>
          <directory>${basedir}/src/test</directory>
          <excludes>
          <exclude>**/*.java</exclude>
          </excludes>
        </resource>
      </resources>
    </unitTest>
    
  </build>
  <reports>
+  </repository>
  
  <dependencies>
    <dependency>
      <id>jetspeed-api</id>
      <groupId>jetspeed2</groupId>
      <version>&jetspeed-version;</version>
    </dependency>
	
  </dependencies>
  <build>
    <sourceDirectory>src/java</sourceDirectory>
     <resources>
      <resource>
        <directory>${basedir}/src/java</directory>
        <excludes>
          <exclude>**/*.java</exclude>
        </excludes>
      </resource>
    </resources>
    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
    <unitTest>
       <includes>
        <include>**/Test*.java</include>
      </includes>
      <excludes>
      </excludes>
      <resources>
        <resource>
          <directory>${basedir}/src/test</directory>
          <excludes>
          <exclude>**/*.java</exclude>
          </excludes>
        </resource>
      </resources>
    </unitTest>
    
  </build>
  <reports>
        <report>maven-javadoc-plugin</report>
   </reports>
     

Added: incubator/graffito/trunk/components/locator.ent
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/locator.ent?rev=190525&view=auto
==============================================================================
--- incubator/graffito/trunk/components/locator.ent (added)
+++ incubator/graffito/trunk/components/locator.ent Mon Jun 13 16:06:50 2005
@@ -0,0 +1,2 @@
+<!-- derive locator.ent from parent -->
+<!ENTITY % locator-ent SYSTEM "file:../locator.ent"> %locator-ent;

Added: incubator/graffito/trunk/components/locator.path
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/locator.path?rev=190525&view=auto
==============================================================================
--- incubator/graffito/trunk/components/locator.path (added)
+++ incubator/graffito/trunk/components/locator.path Mon Jun 13 16:06:50 2005
@@ -0,0 +1 @@
+../
\ No newline at end of file

Modified: incubator/graffito/trunk/components/project.xml
URL: http://svn.apache.org/viewcvs/incubator/graffito/trunk/components/project.xml?rev=190525&r1=190524&r2=190525&view=diff
==============================================================================
--- incubator/graffito/trunk/components/project.xml (original)
+++ incubator/graffito/trunk/components/project.xml Mon Jun 13 16:06:50 2005
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+  <!ENTITY % locator-entities SYSTEM "file:locator.ent"> %locator-entities;
+]>
 <!--
 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
@@ -52,37 +54,37 @@
     <dependency>
       <id>jetspeed-persistence</id>
       <groupId>jetspeed2</groupId>
-      <version>2.0-M3-dev</version>
+      <version>&jetspeed-version;</version>
     </dependency>
     
     <dependency>
       <id>jetspeed-api</id>
       <groupId>jetspeed2</groupId>
-      <version>2.0-M3-dev</version>
+      <version>&jetspeed-version;</version>
     </dependency>
 
     <dependency>
       <id>jetspeed-security</id>
       <groupId>jetspeed2</groupId>
-      <version>2.0-M3-dev</version>
+      <version>&jetspeed-version;</version>
     </dependency>    
      
      <dependency>
       <id>jetspeed-cm</id>
       <groupId>jetspeed2</groupId>
-      <version>2.0-M3-dev</version>
+      <version>&jetspeed-version;</version>
     </dependency>
        
     <dependency>
       <id>jetspeed-rdbms</id>
       <groupId>jetspeed2</groupId>
-      <version>2.0-M3-dev</version>
+      <version>&jetspeed-version;</version>
     </dependency>
 
     <dependency>
       <id>jetspeed-commons</id>
       <groupId>jetspeed2</groupId>
-      <version>2.0-M3-dev</version>
+      <version>&jetspeed-version;</version>
     </dependency>    
     
     <dependency>