[Jpackage-commits] dist/shale/devel .cvsignore, 1.1, 1.2 shale-dialog-basic-pom.patch, NONE, 1.1 shale-jpp-depmap.xml, NONE, 1.1 shale-master-2.pom, NONE, 1.1 shale-notiles-pom.patch, NONE, 1.1 shale-pom.patch, NONE, 1.1 shale-settings.xml, NONE, 1.1 shale-test-CargoTestSetup.patch, NONE, 1.1 shale-test-pom.patch, NONE, 1.1 shale.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 21:46:37 CEST 2008


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

Modified Files:
	.cvsignore sources 
Added Files:
	shale-dialog-basic-pom.patch shale-jpp-depmap.xml 
	shale-master-2.pom shale-notiles-pom.patch shale-pom.patch 
	shale-settings.xml shale-test-CargoTestSetup.patch 
	shale-test-pom.patch shale.spec 
Log Message:
Import from JPP 5.0

--- NEW FILE: shale-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>

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/shale/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 19:46:08 -0000	1.1
--- .cvsignore	28 May 2008 19:46:35 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ shale-autogenerated-files.tar.gz
+ shale-framework-1.0.4.zip

--- NEW FILE: shale-master-2.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.
 *
 * $Id$
-->

<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.shale</groupId>
    <artifactId>shale-master</artifactId>
    <version>2</version>
    <packaging>pom</packaging>
    <name>Apache Shale Framework Master POM</name>
    <description>Apache Shale</description>
    <url>http://shale.apache.org</url>
    <inceptionYear>2004</inceptionYear>

    <mailingLists>
        <mailingList>
            <name>Shale User Mailing List (general questions about using Shale)</name>
            <subscribe>user-subscribe at shale.apache.org</subscribe>
            <unsubscribe>user-unsubscribe at shale.apache.org</unsubscribe>
            <post>user at shale.apache.org</post>
            <archive>http://mail-archives.apache.org/mod_mbox/shale-user/</archive>
            <otherArchives>
                <otherArchive>http://www.mail-archive.com/user@shale.apache.org/</otherArchive>
                <otherArchive>http://dir.gmane.org/gmane.comp.apache.shale.user</otherArchive>
                <otherArchive>http://www.nabble.com/Shale---User-f15689.html</otherArchive>
            </otherArchives>
        </mailingList>
        <mailingList>
            <name>Shale Developer Mailing List (questions about developing Shale itself)</name>
            <subscribe>dev-subscribe at shale.apache.org</subscribe>
            <unsubscribe>dev-unsubscribe at shale.apache.org</unsubscribe>
            <post>dev at shale.apache.org</post>
            <archive>http://mail-archives.apache.org/mod_mbox/shale-dev/</archive>
            <otherArchives>
                <otherArchive>http://www.mail-archive.com/dev@shale.apache.org/</otherArchive>
                <otherArchive>http://dir.gmane.org/gmane.comp.apache.shale.dev</otherArchive>
                <otherArchive>http://www.nabble.com/Shale---Dev-f15682.html</otherArchive>
            </otherArchives>
        </mailingList>
        <mailingList>
            <name>Shale Commit Notifications (Subversion commit logs)</name>
            <subscribe>commits-subscribe at shale.apache.org</subscribe>
            <unsubscribe>commits-unsubscribe at shale.apache.org</unsubscribe>
            <archive>http://mail-archives.apache.org/mod_mbox/shale-commits/</archive>
            <otherArchives>
                <otherArchive>http://www.mail-archive.com/commits@shale.apache.org/</otherArchive>
                <otherArchive>http://dir.gmane.org/gmane.comp.apache.shale.commits</otherArchive>
            </otherArchives>
        </mailingList>
        <mailingList>
            <name>Shale Issue Tracking Notifications (JIRA issue update logs)</name>
            <subscribe>issues-subscribe at shale.apache.org</subscribe>
            <unsubscribe>issues-unsubscribe at shale.apache.org</unsubscribe>
            <archive>http://mail-archives.apache.org/mod_mbox/shale-issues/</archive>
            <otherArchives>
                <otherArchive>http://www.mail-archive.com/issues@shale.apache.org/</otherArchive>
                <otherArchive>http://dir.gmane.org/gmane.comp.apache.shale.issues</otherArchive>
            </otherArchives>
        </mailingList>
    </mailingLists>

    <developers>
        <developer>
            <id>rahul</id>
            <name>Rahul Akolkar</name>
            <email>rahul at apache.org</email>
            <roles>
                <role>Committer</role>
            </roles>
        </developer>
        <developer>
            <id>dgeary</id>
            <name>David Geary</name>
            <email>dgeary at apache.org</email>
            <roles>
                <role>Committer</role>
            </roles>
        </developer>
        <developer>
            <id>craigmcc</id>
            <name>Craig R. McClanahan</name>
            <email>craigmcc at apache.org</email>
            <roles>
                <role>PMC Member</role>
            </roles>
        </developer>
        <developer>
            <id>jmitchell</id>
            <name>James Mitchell</name>
            <email>jmitchell at apache.org</email>
            <roles>
                <role>PMC Member</role>
            </roles>
        </developer>
        <developer>
            <id>greddin</id>
            <name>Greg Reddin</name>
            <email>greddin at apache.org</email>
            <roles>
                <role>PMC Member</role>
            </roles>
        </developer>
        <developer>
            <id>schof</id>
            <name>Sean Schofield</name>
            <email>schof at apache.org</email>
            <roles>
                <role>PMC Member</role>
            </roles>
        </developer>
        <developer>
            <id>wsmoak</id>
            <name>Wendy Smoak</name>
            <email>wsmoak at apache.org</email>
            <roles>
                <role>PMC Member</role>
            </roles>
        </developer>
        <developer>
            <id>gvanmatre</id>
            <name>Gary VanMatre</name>
            <email>gvanmatre at apache.org</email>
            <roles>
                <role>PMC Member</role>
            </roles>
        </developer>
        <developer>
            <id>matzew</id>
            <name>Matthias Wessendorf</name>
            <email>matzew at apache.org</email>
            <roles>
                <role>PMC Member</role>
            </roles>
        </developer>
    </developers>
    <contributors>
        <contributor>
            <name>Walied Amer</name>
        </contributor>
        <contributor>
            <name>Duncan Mills</name>
        </contributor>
        <contributor>
            <name>Ronald Holshausen</name>
        </contributor>
        <contributor>
            <name>Manfred Klug</name>
        </contributor>
        <contributor>
            <name>David DeWolf</name>
        </contributor>
        <contributor>
            <name>Keijo Nurmes</name>
        </contributor>
        <contributor>
            <name>Shane Bryzak</name>
        </contributor>
        <contributor>
            <name>Ted Husted</name>
        </contributor>
        <contributor>
            <name>Dennis Byrne</name>
        </contributor>
        <contributor>
            <name>Richarad Wallace</name>
        </contributor>
        <contributor>
            <name>Bill Young</name>
        </contributor>
        <contributor>
            <name>Alexandre Poitras</name>
        </contributor>
        <contributor>
            <name>Hubert Rabago</name>
        </contributor>
        <contributor>
            <name>David Thielen</name>
        </contributor>
        <contributor>
            <name>Ed Burns</name>
        </contributor>
        <contributor>
            <name>Ingo Dueppe</name>
        </contributor>
        <contributor>
            <name>Jack Cheng</name>
        </contributor>
        <contributor>
            <name>Niall Pemberton</name>
        </contributor>
        <contributor>
            <name>Marcello Teodori</name>
        </contributor>
        <contributor>
            <name>Reind</name>
        </contributor>
        <contributor>
            <name>Mike Kienenberger</name>
        </contributor>
        <contributor>
            <name>Andrew Gilette</name>
        </contributor>
        <contributor>
            <name>Ryan Lubke</name>
        </contributor>
        <contributor>
            <name>Shinsuke Sugaya</name>
        </contributor>
        <contributor>
            <name>Mario Ivankovits</name>
        </contributor>
        <contributor>
            <name>Hermod Opstvedt</name>
        </contributor>
        <contributor>
            <name>Mike Meessen</name>
        </contributor>
        <contributor>
            <name>Luis Parravicini</name>
        </contributor>
        <contributor>
            <name>Ryan Wynn</name>
        </contributor>
        <contributor>
            <name>Rene Zanner</name>
        </contributor>
        <contributor>
            <name>Adrian Mitev</name>
        </contributor>
        <contributor>
            <name>Simon Kitching</name>
        </contributor>
    </contributors>

    <scm>
        <connection>scm:svn:http://svn.apache.org/repos/asf/shale/maven/trunk/master-pom</connection>
        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shale/maven/trunk/master-pom</developerConnection>
        <url>http://svn.apache.org/viewcvs.cgi/shale/maven/trunk/master-pom</url>
    </scm>   

    <distributionManagement>
        <repository>
            <id>shale-staging</id>
            <name>Apache Shale Staging Repository</name>
            <url>scpexe://people.apache.org/www/people.apache.org/builds/shale/m2-staging-repository</url>
        </repository>
        <snapshotRepository>
            <uniqueVersion>false</uniqueVersion>
            <id>apache.snapshots</id>
            <name>Apache Development Snapshot Repository</name>
            <url>scpexe://people.apache.org/www/people.apache.org/repo/m2-snapshot-repository</url>
        </snapshotRepository>
        <site>
            <id>apache-site</id>
            <name>Apache Shale Website</name>
            <url>scpexe://people.apache.org/www/shale.apache.org</url>
        </site>
    </distributionManagement>

</project>

--- NEW FILE: shale-dialog-basic-pom.patch ---
--- shale-dialog-basic/pom.xml.sav	2008-02-01 00:57:14.000000000 +0100
+++ shale-dialog-basic/pom.xml	2008-02-01 00:58:51.000000000 +0100
@@ -35,6 +35,11 @@
     <dependencies>
 
         <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>commons-digester</groupId>
             <artifactId>commons-digester</artifactId>
         </dependency>

--- NEW FILE: shale-pom.patch ---
--- pom.xml.sav3	2007-01-05 12:09:28.000000000 +0100
+++ pom.xml	2008-02-20 12:23:18.000000000 +0100
@@ -272,17 +272,19 @@
             </plugin>
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
+<!--
                 <configuration>
-                    <!--aggregate>true</aggregate-->
+                    <aggregate>true</aggregate>
                     <links>
                         <link>http://java.sun.com/j2se/1.4.2/docs/api</link>
                         <link>http://java.sun.com/j2ee/sdk_1.2.1/techdocs/api</link>
-                        <link>http://jakarta.apache.org/commons/chain/apidocs</link>
-                        <link>http://jakarta.apache.org/commons/digester/commons-digester-1.8/docs/api</link>
-                        <link>http://jakarta.apache.org/commons/logging/commons-logging-1.1/apidocs</link>
-                        <link>http://jakarta.apache.org/commons/validator/api-release/</link>
+                        <link>http://commons.apache.org/chain/apidocs</link>
+                        <link>http://commons.apache.org/digester/commons-digester-1.8/docs/api</link>
+                        <link>http://commons.apache.org/logging/commons-logging-1.1/apidocs</link>
+                        <link>http://commons.apache.org/validator/api-release/</link>
                     </links>
                 </configuration>
+-->
             </plugin>
             <plugin>
                 <artifactId>maven-surefire-report-plugin</artifactId>
@@ -345,6 +347,12 @@
             </dependency>
 
             <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>1.7.0</version>
+            </dependency>
+
+            <dependency>
                 <groupId>commons-digester</groupId>
                 <artifactId>commons-digester</artifactId>
                 <version>1.8</version>

--- NEW FILE: shale-test-CargoTestSetup.patch ---
--- shale-test/src/main/java/org/apache/shale/test/cargo/CargoTestSetup.java.sav	2008-02-01 00:19:22.000000000 +0100
+++ shale-test/src/main/java/org/apache/shale/test/cargo/CargoTestSetup.java	2008-02-01 00:27:58.000000000 +0100
@@ -104,6 +104,7 @@
         LocalConfiguration configuration =
                 (LocalConfiguration) configurationFactory.createConfiguration(
                         containerId,
+                        ContainerType.INSTALLED,
                         ConfigurationType.STANDALONE);
 
         // Find and (if provided) set the port to use for the container.
@@ -127,7 +128,7 @@
             containerHome = System.getenv("TOMCAT_HOME");
         }
         System.out.println("[INFO] container home: " + containerHome);
-        container.setHome(new File(containerHome));
+        container.setHome(containerHome);
 
         // Find and (if provided) set the path to a log file
         String containerLog = System.getProperty("cargo.container.log");
@@ -140,7 +141,7 @@
         String containerOutput = System.getProperty("cargo.container.output");
         if (containerOutput != null) {
             System.out.println("[INFO] container output: " + containerOutput);
-            container.setOutput(new File(containerOutput));
+            container.setOutput(containerOutput);
         }
 
         container.start();

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/shale/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 19:46:08 -0000	1.1
--- sources	28 May 2008 19:46:35 -0000	1.2
***************
*** 0 ****
--- 1,2 ----
+ 7cfc502172b3cf99e6e31268427678ca  shale-autogenerated-files.tar.gz
+ fc6e0de0350aae4803b016691be81279  shale-framework-1.0.4.zip

--- NEW FILE: shale-notiles-pom.patch ---
--- pom.xml.sav	2008-02-01 16:02:26.000000000 +0100
+++ pom.xml	2008-02-01 16:02:40.000000000 +0100
@@ -152,7 +152,9 @@
         <module>shale-remoting</module>
         <module>shale-spring</module>
         <module>shale-test</module>
+<!--
         <module>shale-tiles</module>
+-->
         <module>shale-validator</module>
         <module>shale-view</module>
     </modules>

--- NEW FILE: shale-test-pom.patch ---
--- shale-test/pom.xml.sav	2008-01-28 14:33:51.000000000 +0100
+++ shale-test/pom.xml	2008-01-28 14:34:55.000000000 +0100
@@ -151,6 +151,12 @@
                     <version>2.1</version>
                     <scope>provided</scope>
                 </dependency>
+                <dependency>
+                    <groupId>javax.el</groupId>
+                    <artifactId>el-api</artifactId>
+                    <version>1.0</version>
+                    <scope>provided</scope>
+                </dependency>
             </dependencies>
         </profile>
 

--- NEW FILE: shale.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}

# Optionally omit build of shale-tiles while bootstrapping
%define bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
# Set to true for now, as module not compatible with current tiles2 
%define bootstrap 1


Name:           shale
Version:        1.0.4
Release:        1jpp
Epoch:          0
Summary:        Shale Framework
License:        Apache Software License 2.0
Group:          Development/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
URL:            http://shale.apache.org/
Source0:        http://www.apache.org/dist/shale/framework/shale-framework-1.0.4.zip

Source1:        %{name}-master-2.pom
Source2:        %{name}-jpp-depmap.xml
Source3:        %{name}-settings.xml
Source4:        %{name}-autogenerated-files.tar.gz
Patch0:         %{name}-test-pom.patch
Patch1:         %{name}-test-CargoTestSetup.patch
Patch2:         %{name}-dialog-basic-pom.patch
Patch3:         %{name}-pom.patch
Patch4:         %{name}-notiles-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:  ant-junit
BuildRequires:  junit
%if %{with_maven}
BuildRequires:  maven2-common-poms
BuildRequires:  maven2 >= 0:2.0.7
BuildRequires:  maven2-plugin-ant
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-plugin
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-surefire
BuildRequires:  maven2-plugin-war
BuildRequires:  mojo-maven2-plugin-cobertura
%endif
BuildRequires:  cargo
BuildRequires:  el_1_0_api
BuildRequires:  htmlunit
BuildRequires:  jakarta-commons-beanutils
BuildRequires:  jakarta-commons-chain
BuildRequires:  jakarta-commons-collections
BuildRequires:  jakarta-commons-digester
BuildRequires:  jakarta-commons-logging
BuildRequires:  jakarta-commons-scxml
BuildRequires:  jakarta-commons-validator
BuildRequires:  jmock
BuildRequires:  jsf_1_2_api
BuildRequires:  jsp_2_1_api
BuildRequires:  myfaces
BuildRequires:  servlet_2_5_api
BuildRequires:  spring-beans
BuildRequires:  spring-context
BuildRequires:  spring-core
BuildRequires:  spring-web
%if ! %{bootstrap}
BuildRequires:  tiles
%endif

Requires:  jakarta-commons-logging >= 0:1.1
Requires:  el_1_0_api
Requires:  jsf_1_2_api
Requires:  jsp_2_1_api
Requires:  servlet_2_5_api

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

%description
Shale is a modern web application framework, fundamentally 
based on JavaServer Faces. Architecturally, Shale is a set 
of loosely coupled services that can be combined as needed 
to meet particular application requirements. Shale provides 
additional functionality such as application event callbacks, 
dialogs with conversation-scoped state, a view technology 
called Clay, annotation-based functionality to reduce 
configuration requirements and support for remoting. Shale 
also provides integration links for other frameworks, to ease 
development when combinations of technologies are required.

%package application
Summary:        Shale Application Control
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       jakarta-commons-chain
Requires:       jakarta-commons-digester >= 0:1.8

%description application
%{summary}.

%package clay
Summary:        Shale Clay
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description clay
%{summary}.

%package dialog
Summary:        Shale Dialog Manager
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description dialog
%{summary}.

%package dialog-basic
Summary:        Shale Dialog Manager Basic Impl
Group:          Development/Java
Requires:       %{name}-dialog = %{epoch}:%{version}-%{release}
Requires:       jakarta-commons-beanutils >= 0:1.7.0
Requires:       jakarta-commons-digester >= 0:1.8

%description dialog-basic
%{summary}.

%package dialog-scxml
Summary:        Shale Dialog Manager SCXML Impl
Group:          Development/Java
Requires:       %{name}-dialog = %{epoch}:%{version}-%{release}
Requires:       jakarta-commons-digester >= 0:1.8
Requires:       jakarta-commons-scxml >= 0:0.7

%description dialog-scxml
%{summary}.

%package remoting
Summary:        Shale Remoting
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       jakarta-commons-chain

%description remoting
%{summary}.

%package spring
Summary:        Shale Spring Integration
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       spring-beans >= 0:1.2.9
Requires:       spring-context >= 0:1.2.9
Requires:       spring-core >= 0:1.2.9
Requires:       spring-web >= 0:1.2.9

%description spring
%{summary}.

%package test
Summary:        Shale Test Framework
Group:          Development/Java
Requires:       htmlunit
Requires:       jmock
Requires:       junit
Requires:       cargo
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description test
%{summary}.

%package tiger
Summary:        Shale Tiger Extensions
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       %{name}-view = %{epoch}:%{version}-%{release}
Requires:       jakarta-commons-digester >= 0:1.8

%description tiger
%{summary}.

%if ! %{bootstrap}
%package tiles
Summary:        Shale Tiles Integration
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       tiles-core

%description tiles
%{summary}.
%endif

%package validator
Summary:        Shale Validator Integration
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}
Requires:       jakarta-commons-validator >= 0:1.3.1
Requires:       jakarta-oro

%description validator
%{summary}.

%package view
Summary:        Shale View Controller
Group:          Development/Java
Requires:       %{name} = %{epoch}:%{version}-%{release}

%description view
%{summary}.


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

%description javadoc
%{summary}.

%package manual
Summary:        Documents for %{name}
Group:          Development/Documentation

%description manual
%{summary}.

%prep
%setup -q -n %{name}-framework-%{version}
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
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
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
%if %{bootstrap}
# omit tiles while bootstrapping
# always omitting for now
%patch4 -b .sav4
%endif

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

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

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

export M2_SETTINGS=$(pwd)/settings.xml
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
%else
#[INFO] Reactor build order: 
#[INFO]   Apache Shale Framework Parent POM
#[INFO]   Shale Test Framework
#[INFO]   Shale Core
#[INFO]   Shale Application Controller
#[INFO]   Shale Clay
#[INFO]   Shale Dialog Manager
#[INFO]   Shale Dialog Manager (Basic Implementation)
#[INFO]   Shale Dialog Manager (SCXML Implementation)
#[INFO]   Shale Remoting
#[INFO]   Shale Spring Integration
#[INFO]   Shale Validator Integration
#[INFO]   Shale View Controller
#[INFO]   Shale Tiger Extensions
export OPT_JAR_LIST="ant/ant-junit junit"
export CLASSPATH=$(build-classpath \
cargo/cargo-ant \
cargo/cargo-core-api-container \
cargo/cargo-core-api-generic \
cargo/cargo-core-api-util \
cargo/cargo-core-container-tomcat \
el_1_0_api \
htmlunit \
jmock \
jmock-cglib \
jsf_1_2_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-test
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-logging \
el_1_0_api \
jsf_1_2_api \
jsp_2_1_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-core
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-chain \
commons-logging \
jsf_1_2_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-application
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-beanutils \
commons-chain \
commons-collections \
commons-digester \
commons-logging \
el_1_0_api \
jsf_1_2_api \
jsp_2_1_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-clay
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-logging \
jsf_1_2_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-dialog
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-beanutils \
commons-digester \
commons-logging \
jsf_1_2_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-dialog/target/shale-dialog-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-dialog-basic
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-beanutils \
commons-digester \
commons-logging \
commons-scxml \
jsf_1_2_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-dialog/target/shale-dialog-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-dialog-scxml
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-chain \
commons-logging \
el_1_0_api \
jsf_1_2_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-remoting
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-logging \
jsf_1_2_api \
spring/web \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-spring
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-beanutils \
commons-digester \
commons-logging \
commons-validator \
el_1_0_api \
jsp_2_1_api \
jsf_1_2_api \
oro \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-validator
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-logging \
el_1_0_api \
jsf_1_2_api \
jsp_2_1_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-view
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
export CLASSPATH=$(build-classpath \
commons-digester \
commons-logging \
el_1_0_api \
jsf_1_2_api \
servlet_2_5_api \
)
CLASSPATH=$CLASSPATH:$(pwd)/shale-test/target/shale-test-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-core/target/shale-core-%{version}.jar
CLASSPATH=$CLASSPATH:$(pwd)/shale-view/target/shale-view-%{version}.jar
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
pushd shale-tiger
   ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
popd
%endif

%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

for module in \
           application \
           clay \
           core \
           dialog-basic \
           dialog-scxml \
           dialog \
           remoting \
           spring \
           test \
           tiger \
%if ! %{bootstrap}
           tiles \
%endif
           validator \
           view \
           ; do
install -m 644 shale-$module/target/shale-$module-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/$module-%{version}.jar
%add_to_maven_depmap org.apache.shale shale-$module %{version} JPP/shale $module
install -m 644 shale-$module/pom.xml $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.shale-$module.pom

install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$module
cp -pr shale-$module/target/site/apidocs/* \
                    $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$module
done

%add_to_maven_depmap org.apache.shale shale-master 2 JPP/shale master
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP.shale-master.pom

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

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

ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink

install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -pr docs $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{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,-)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/core*.jar
%{_datadir}/maven2
%{_mavendepmapfragdir}
%doc %{_docdir}/%{name}-%{version}/LICENSE.txt

%files application
%defattr(-,root,root,-)
%{_javadir}/%{name}/application*.jar

%files clay
%defattr(-,root,root,-)
%{_javadir}/%{name}/clay*.jar

%files dialog
%defattr(-,root,root,-)
%{_javadir}/%{name}/dialog-%{version}.jar
%{_javadir}/%{name}/dialog.jar

%files dialog-basic
%defattr(-,root,root,-)
%{_javadir}/%{name}/dialog-basic*.jar

%files dialog-scxml
%defattr(-,root,root,-)
%{_javadir}/%{name}/dialog-scxml*.jar

%files remoting
%defattr(-,root,root,-)
%{_javadir}/%{name}/remoting*.jar

%files spring
%defattr(-,root,root,-)
%{_javadir}/%{name}/spring*.jar

%files test
%defattr(-,root,root,-)
%{_javadir}/%{name}/test*.jar

%files tiger
%defattr(-,root,root,-)
%{_javadir}/%{name}/tiger*.jar

%if ! %{bootstrap}
%files tiles
%defattr(-,root,root,-)
%{_javadir}/%{name}/tiles*.jar
%endif

%files validator
%defattr(-,root,root,-)
%{_javadir}/%{name}/validator*.jar

%files view
%defattr(-,root,root,-)
%{_javadir}/%{name}/view*.jar

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

%files manual
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}/docs

%changelog
* Wed Feb 20 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0.4-1jpp
- First release


--- NEW FILE: shale-jpp-depmap.xml ---
<dependencies>
  <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>javax.faces</groupId>
	  <artifactId>jsf-api</artifactId>
	  <version>1.2_02</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>sun-jsf-1.2-api</artifactId>
	  <version>1.2_04</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>javax.servlet.jsp</groupId>
	  <artifactId>jsp-api</artifactId>
	  <version>2.1</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>jsp_2_1_api</artifactId>
	  <version>2.1</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>javax.el</groupId>
	  <artifactId>el-api</artifactId>
	  <version>1.0</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>el_1_0_api</artifactId>
	  <version>1.0</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.apache.myfaces.core</groupId>
	  <artifactId>myfaces-api</artifactId>
	  <version>1.1.4</version>
	</maven>
	<jpp>
	  <groupId>JPP/myfaces</groupId>
	  <artifactId>myfaces-jsf-api</artifactId>
	  <version>1.1.0</version>
	</jpp>
  </dependency>
  <dependency>
	<maven>
	  <groupId>org.apache.myfaces.core</groupId>
	  <artifactId>myfaces-impl</artifactId>
	  <version>1.1.4</version>
	</maven>
	<jpp>
	  <groupId>JPP/myfaces</groupId>
	  <artifactId>myfaces-impl</artifactId>
	  <version>1.1.0</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>commons-digester</groupId>
	  <artifactId>commons-digester</artifactId>
	  <version>1.8</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>commons-digester</artifactId>
	  <version>1.7</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>commons-chain</groupId>
	  <artifactId>commons-chain</artifactId>
	  <version>1.1</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>commons-chain</artifactId>
	  <version>1.1</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>commons-scxml</groupId>
	  <artifactId>commons-scxml</artifactId>
	  <version>0.6</version>
	</maven>
	<jpp>
	  <groupId>JPP</groupId>
	  <artifactId>commons-scxml</artifactId>
	  <version>0.7</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.springframework</groupId>
	  <artifactId>spring-beans</artifactId>
	  <version>1.2.8</version>
	</maven>
	<jpp>
	  <groupId>JPP/spring</groupId>
	  <artifactId>beans</artifactId>
	  <version>1.2.9</version>
	</jpp>
  </dependency>

  <dependency>
	<maven>
	  <groupId>org.apache.struts.tiles</groupId>
	  <artifactId>tiles-core</artifactId>
	  <version>2.0-r468346-SNAPSHOT</version>
	</maven>
	<jpp>
	  <groupId>JPP/tiles</groupId>
	  <artifactId>core</artifactId>
	  <version>2.0.5</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>




More information about the JPackage-commits mailing list