[Jpackage-commits] dist/tiles/devel .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 tiles-2.0.5-pom.patch, NONE, 1.1 tiles-build.xml, NONE, 1.1 tiles-jpp-depmap.xml, NONE, 1.1 tiles-master-1.pom, NONE, 1.1 tiles-settings.xml, NONE, 1.1 tiles.spec, NONE, 1.1

jpackage jpackage at ryu.zarb.org
Wed May 28 22:10:22 CEST 2008


Update of /home/projects/jpackage/cvs/dist/tiles/devel
In directory ryu.zarb.org:/tmp/cvs-serv14504/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tiles-2.0.5-pom.patch tiles-build.xml tiles-jpp-depmap.xml 
	tiles-master-1.pom tiles-settings.xml tiles.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tiles/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 20:10:02 -0000	1.1
--- .cvsignore	28 May 2008 20:10:20 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ tiles-2.0.5-src.tar.gz
+ tiles-autogenerated-files.tar.gz

--- NEW FILE: tiles-master-1.pom ---
<?xml version="1.0" encoding="UTF-8"?>

<!--
    Licensed to the Apache Software Foundation (ASF) under one or more
    contributor license agreements.  See the NOTICE file distributed with
    this work for additional information regarding copyright ownership.
    The ASF licenses this file to You 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="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
      <groupId>org.apache</groupId>
      <artifactId>apache</artifactId>
      <version>3</version>
   </parent>
   <groupId>org.apache.tiles</groupId>
   <artifactId>tiles-master</artifactId>
   <version>1</version>
   <packaging>pom</packaging>
   <name>Apache Tiles (Master POM)</name>

   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-1</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-1</developerConnection>
     <url>http://svn.apache.org/repos/asf/tiles/maven/tags/tiles-master-1</url>
   </scm>
   
   <description>
      The Apache Tiles project.  This master pom provides the default values for 
      common maven configuration throughout the Tiles project.
   </description>
   <url>http://tiles.apache.org/</url>
   <inceptionYear>2001</inceptionYear>

    <organization>
        <name>Apache Software Foundation</name>
        <url>http://www.apache.org</url>
    </organization>

    <licenses>
        <license>
            <name>The Apache Software License, Version 2.0</name>
            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
            <distribution>repo</distribution>
            <comments />
        </license>
    </licenses>

    <issueManagement>
        <system>JIRA</system>
        <url>https://issues.apache.org/struts/browse/TILES</url>
    </issueManagement>

    <distributionManagement>
        <repository>
            <id>tiles-staging</id>
            <name>Apache Tiles Staging Repository</name>
            <url>scp://people.apache.org/www/people.apache.org/builds/tiles/m2-staging-repository</url>
        </repository>
        <snapshotRepository>
            <id>apache.snapshots</id>
            <name>Apache Development Snapshot Repository</name>
            <url>scp://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
            <uniqueVersion>true</uniqueVersion>
        </snapshotRepository>
        <site>
            <id>apache-site</id>
            <url>scp://people.apache.org/www/tiles.apache.org</url>
        </site>
    </distributionManagement>

    <mailingLists>
      <mailingList>
         <name>Tiles User List</name>
         <subscribe>users-subscribe at tiles.apache.org</subscribe>
         <unsubscribe>users-unsubscribe at tiles.apache.org</unsubscribe>
         <post>users at tiles.apache.org</post>
         <archive>http://mail-archives.apache.org/mod_mbox/tiles-users/</archive>
      </mailingList>
      <mailingList>
         <name>Tiles Development List</name>
         <subscribe>dev-subscribe at tiles.apache.org</subscribe>
         <unsubscribe>dev-unsubscribe at tiles.apache.org</unsubscribe>
         <post>dev at tiles.apache.org</post>
         <archive>http://mail-archives.apache.org/mod_mbox/tiles-dev/</archive>
      </mailingList>
      <mailingList>
         <name>Tiles Commits List</name>
         <subscribe>commits-subscribe at tiles.apache.org</subscribe>
         <unsubscribe>commits-unsubscribe at tiles.apache.org</unsubscribe>
         <archive>http://mail-archives.apache.org/mod_mbox/tiles-commits/</archive>
      </mailingList>
      <mailingList>
         <name>Tiles Issues List</name>
         <subscribe>issues-subscribe at tiles.apache.org</subscribe>
         <unsubscribe>issues-unsubscribe at tiles.apache.org</unsubscribe>
         <archive>http://mail-archives.apache.org/mod_mbox/tiles-issues/</archive>
      </mailingList>
      <mailingList>
         <name>Tiles Notifications List</name>
         <subscribe>notifications-subscribe at tiles.apache.org</subscribe>
         <unsubscribe>notifications-unsubscribe at tiles.apache.org</unsubscribe>
         <archive>http://mail-archives.apache.org/mod_mbox/tiles-notifications/</archive>
      </mailingList>
   </mailingLists>

  <developers>
    
      <developer>
         <name>Antonio Petrelli</name>
         <id>apetrelli</id>
         <email>apetrelli at apache.org</email>
         <roles>
            <role>PMC Member</role>
         </roles>
      </developer>
      <developer>
         <name>David H. DeWolf</name>
         <id>ddewolf</id>
         <email>ddewolf at apache.org</email>
         <roles>
            <role>PMC Member</role>
         </roles>
      </developer>
      <developer>
         <name>Greg Reddin</name>
         <id>greddin</id>
         <email>greddin at apache.org</email>
         <roles>
            <role>PMC Chair</role>
         </roles>
      </developer>
      <developer>
         <name>Joe Germuska</name>
         <id>germuska</id>
         <email>germuska at apache.org</email>
         <roles>
            <role>PMC Member</role>
         </roles>
      </developer>
      <developer>
         <name>Martin Cooper</name>
         <id>martinc</id>
         <email>martinc at apache.org</email>
         <roles>
            <role>PMC Member</role>
         </roles>
      </developer>
      <developer>
         <name>Nathan Bubna</name>
         <id>nbubna</id>
         <email>nbubna at apache.org</email>
         <roles>
            <role>PMC Member</role>
         </roles>
      </developer>
      <developer>
         <name>Wendy Smoak</name>
         <id>wsmoak</id>
         <email>wsmoak at apache.org</email>
         <roles>
            <role>PMC Member</role>
         </roles>
      </developer>
  </developers>
</project>

--- NEW FILE: tiles.spec ---
# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define section   free

# If you don't want to build with maven, and use straight ant instead,
# give rpmbuild option '--without maven'

%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}

Name:           tiles
Version:        2.0.5
Release:        1jpp
Epoch:          0
Summary:        Apache Tiles
License:        Apache Software License 2.0
Group:          Development/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
URL:            http://tiles.apache.org/
Source0:        http://www.apache.org/dist/tiles/v2.0.5/tiles-2.0.5-src.tar.gz

Source1:        %{name}-build.xml
Source2:        %{name}-jpp-depmap.xml
Source3:        %{name}-settings.xml
Source4:        %{name}-autogenerated-files.tar.gz
Source5:        tiles-master-1.pom
Patch0:         %{name}-%{version}-pom.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot

BuildArch:      noarch
BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  junit
BuildRequires:  sed
%if %{with_maven}
BuildRequires:  cargo-maven2-plugin
BuildRequires:  maven2-common-poms
BuildRequires:  maven2 >= 0:2.0.7
BuildRequires:  maven2-plugin-ant
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-checkstyle
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-dependency
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-jxr
BuildRequires:  maven2-plugin-plugin
BuildRequires:  maven2-plugin-pmd
BuildRequires:  maven2-plugin-project-info-reports
BuildRequires:  maven2-plugin-release
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-site
BuildRequires:  maven2-plugin-source
BuildRequires:  maven2-plugin-surefire
BuildRequires:  maven2-plugin-surefire-report
BuildRequires:  maven2-plugin-war
%endif
BuildRequires:  easymock2
BuildRequires:  freemarker
BuildRequires:  jakarta-commons-digester
BuildRequires:  jakarta-commons-logging
BuildRequires:  jakarta-taglibs-standard
BuildRequires:  jsp_2_0_api
BuildRequires:  portlet_1_0_api
BuildRequires:  servlet_2_4_api
BuildRequires:  shale-test
BuildRequires:  umlgraph

Requires:  java >= 0:1.5.0
Requires:  freemarker
Requires:  jakarta-commons-digester
Requires:  jakarta-commons-logging
Requires:  jakarta-taglibs-standard
Requires:  jsp_2_0_api
Requires:  portlet_1_0_api
Requires:  servlet_2_4_api

Requires(post):   jpackage-utils >= 0:1.7.4
Requires(postun): jpackage-utils >= 0:1.7.4

%description
Apache Tiles is a templating framework built to simplify the
development of web application user interfaces. Tiles allows
authors to define page fragments which can be assembled into
a complete page at runtime. These fragments, or tiles, can
be used as simple includes in order to reduce the duplication
of common page elements or embedded within other tiles to
develop a series of reusable templates. These templates
streamline the development of a consistent look and feel
across an entire application. Tiles grew in popularity as a
component of the popular Struts framework. It has since been
extracted from Struts and is now integrated with various
frameworks, such as Struts 2 and Shale. 


%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation
Requires(post):   /bin/rm,/bin/ln
Requires(postun): /bin/rm

%description javadoc
%{summary}.

%prep
%setup -q 
cp %{SOURCE1} build.xml
cp %{SOURCE3} settings.xml
%if %{without_maven}
gzip -dc %{SOURCE4} | tar xf -
%endif
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
%patch0 -b .sav0

%build
export JAVA_HOME=%{_jvmdir}/java-1.5.0

export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/
cp %{SOURCE5} .m2/repository/JPP/maven2/default_poms/org.apache.tiles-tiles-master.pom

mkdir -p $MAVEN_REPO_LOCAL/org.apache.tiles
ln -sf ../org/apache/tiles/tiles-api/%{version}/tiles-api-%{version}.jar $MAVEN_REPO_LOCAL/org.apache.tiles/tiles-api.jar
ln -sf ../org/apache/tiles/tiles-core/%{version}/tiles-core-%{version}.jar $MAVEN_REPO_LOCAL/org.apache.tiles/tiles-core.jar
ln -sf ../org/apache/tiles/tiles-jsp/%{version}/tiles-jsp-%{version}.jar $MAVEN_REPO_LOCAL/org.apache.tiles/tiles-jsp.jar

mkdir external_repo
ln -s %{_javadir} external_repo/JPP

export M2_SETTINGS=$(pwd)/settings.xml
cd src
%if %{with_maven}
    mvn-jpp \
        -e \
        -s $M2_SETTINGS \
        -Dmaven.test.failure.ignore=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        ant:ant install javadoc:javadoc
cd assembly
    mvn-jpp \
        -e \
        -s $M2_SETTINGS \
        -Dmaven.test.failure.ignore=true \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        assembly:assembly
%else
#[INFO] Reactor build order:
#[INFO]   Tiles 2
#[INFO]   Tiles - API
#[INFO]   Tiles - Core Library
#[INFO]   Tiles - JSP support
#[INFO]   Tiles - Apps - Test
#[INFO]   Tiles Assembly

export OPT_JAR_LIST="umlgraph"
export CLASSPATH=$(build-classpath \
commons-logging \
easymock2 \
servlet_2_4_api \
)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd tiles-api
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-digester \
commons-logging \
easymock2 \
portlet_1_0_api \
servlet_2_4_api \
shale/test \
)
CLASSPATH=$CLASSPATH:$(pwd)/tiles-api/target/tiles-api-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd tiles-core
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-logging \
jsp_2_0_api \
servlet_2_4_api \
shale/test \
)
CLASSPATH=$CLASSPATH:$(pwd)/tiles-api/target/tiles-api-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/tiles-core/target/tiles-core-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd tiles-jsp
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
pushd tiles-test
ant \
    -Dfreemarker.jar=$(build-classpath freemarker) \
    -Djstl.jar=$(build-classpath taglibs-core) \
    -Dstandard.jar=$(build-classpath taglibs-standard) \
    -Dtiles-jsp.jar=$(pwd)/../tiles-jsp/target/tiles-jsp-%{version}.jar \
    -Dmaven.settings.offline=true -Dbuild.sysclasspath=only war
popd
%endif
for f in $(find . -name "*.dot"); do
    sed -i -e 's|/usr/local/bin/dot|/usr/bin/dot|' $f
done


%install
rm -rf $RPM_BUILD_ROOT
# jars/poms
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

%add_to_maven_depmap org.apache.tiles %{name}-master %{version} JPP/%{name} master
install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-master.pom

%add_to_maven_depmap org.apache.tiles %{name}-parent %{version} JPP/%{name} parent
install -m 644 src/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-parent.pom

install -m 644 src/%{name}-api/target/%{name}-api-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/api-%{version}.jar
%add_to_maven_depmap org.apache.tiles %{name}-api %{version} JPP/%{name} api
install -m 644 src/%{name}-api/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-api.pom

install -m 644 src/%{name}-core/target/%{name}-core-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
%add_to_maven_depmap org.apache.tiles %{name}-core %{version} JPP/%{name} core
install -m 644 src/%{name}-core/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-core.pom

install -m 644 src/%{name}-jsp/target/%{name}-jsp-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/jsp-%{version}.jar
%add_to_maven_depmap org.apache.tiles %{name}-jsp %{version} JPP/%{name} jsp
install -m 644 src/%{name}-jsp/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.%{name}-jsp.pom

(cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)

# javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
cp -pr src/%{name}-api/target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/api
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
cp -pr src/%{name}-core/target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/core
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jsp
cp -pr src/%{name}-jsp/target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/jsp
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

# test war
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
install -m 644 src/%{name}-test/target/tiles-test.war $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
rm -f %{_javadocdir}/%{name}
ln -s %{name}-%{version} %{_javadocdir}/%{name}

%postun javadoc
if [ "$1" = "0" ]; then
  rm -f %{_javadocdir}/%{name}
fi

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%{_javadir}/%{name}
%{_datadir}/maven2
%{_mavendepmapfragdir}
%{_datadir}/%{name}-%{version}

%files javadoc
%defattr(-,root,root,-)
%doc %{_javadocdir}/%{name}-%{version}
%ghost %doc %{_javadocdir}/%{name}

%changelog
* Mon Feb 18 2008 Ralph Apel <r.apel at r-apel.de> 0:2.0.5-1jpp
- First release


Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/tiles/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 20:10:02 -0000	1.1
--- sources	28 May 2008 20:10:20 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ 0b37eb09281b73ad223f999e39a98f72  tiles-2.0.5-src.tar.gz
+ fc5e8e608908362673b692ab1d1da14d  tiles-autogenerated-files.tar.gz

--- NEW FILE: tiles-jpp-depmap.xml ---
<dependencies>
  <dependency>
	<maven>
	  <groupId>org.easymock</groupId>
	  <artifactId>easymock</artifactId>
	  <version>2.2</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>easymock2</artifactId>
	  <version>2.0</version>
	</jpp>
  </dependency>
  <dependency>
	<maven>
	  <groupId>javax.servlet</groupId>
	  <artifactId>jsp-api</artifactId>
	  <version>2.0</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>jsp_2_0_api</artifactId>
	  <version>2.0</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>gr.spinellis</groupId>
	  <artifactId>UmlGraph</artifactId>
	  <version>4.6</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>umlgraph</artifactId>
	  <version>4.6</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>junit</groupId>
	  <artifactId>junit4</artifactId>
	  <version>4.0</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>junit4</artifactId>
	  <version>4.3.1</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.freemarker</groupId>
	  <artifactId>freemarker</artifactId>
	  <version>2.3.10</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>freemarker</artifactId>
	  <version>2.3.6</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>javax.servlet</groupId>
	  <artifactId>jstl</artifactId>
	  <version>1.1.2</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>taglibs-core</artifactId>
	  <version>1.1.1</version>
	</jpp>
  </dependency>
  <dependency>
	<maven>
	  <groupId>taglibs</groupId>
	  <artifactId>standard</artifactId>
	  <version>1.1.2</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>taglibs-standard</artifactId>
	  <version>1.1.1</version>
	</jpp>
  </dependency>
  <dependency>
	<maven>
	  <groupId>javax.servlet</groupId>
	  <artifactId>servlet-api</artifactId>
	  <version>2.3</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>servlet_2_4_api</artifactId>
	  <version>2.4</version>
	</jpp>
  </dependency>

</dependencies>

--- NEW FILE: tiles-build.xml ---

--- NEW FILE: tiles-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: tiles-2.0.5-pom.patch ---
--- src/pom.xml.sav	2008-02-03 13:38:01.000000000 +0100
+++ src/pom.xml	2008-02-03 13:38:19.000000000 +0100
@@ -141,7 +141,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
-                    <aggregate>true</aggregate>
+                    <aggregate>false</aggregate>
                     <excludePackageNames>org.apache.tiles.test</excludePackageNames>
                     <links>
                         <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
@@ -291,4 +291,4 @@
             </releases>
         </pluginRepository>
     </pluginRepositories>
-</project>
\ No newline at end of file
+</project>




More information about the JPackage-commits mailing list