[Jpackage-commits] dist/jakarta-commons-javaflow/devel .cvsignore, 1.1, 1.2 commons-javaflow-1.0-jpp-depmap.xml, NONE, 1.1 commons-javaflow-1.0-navigation_xml.patch, NONE, 1.1 commons-javaflow-1.0-pom.patch, NONE, 1.1 commons-javaflow-1.0-site_xml.patch, NONE, 1.1 commons-javaflow-commons-sandbox.pom, NONE, 1.1 commons-javaflow-settings.xml, NONE, 1.1 jakarta-commons-javaflow.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Wed May 28 20:27:21 CEST 2008


Update of /home/projects/jpackage/cvs/dist/jakarta-commons-javaflow/devel
In directory ryu.zarb.org:/tmp/cvs-serv20653/devel

Modified Files:
	.cvsignore sources 
Added Files:
	commons-javaflow-1.0-jpp-depmap.xml 
	commons-javaflow-1.0-navigation_xml.patch 
	commons-javaflow-1.0-pom.patch 
	commons-javaflow-1.0-site_xml.patch 
	commons-javaflow-commons-sandbox.pom 
	commons-javaflow-settings.xml jakarta-commons-javaflow.spec 
Log Message:
Import from JPP 5.0

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jakarta-commons-javaflow/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	28 May 2008 18:26:59 -0000	1.1
--- .cvsignore	28 May 2008 18:27:19 -0000	1.2
***************
*** 0 ****
--- 1,3 ----
+ commons-build.tar.gz
+ commons-javaflow-1.0-r618928.tar.gz
+ commons-javaflow-autogenerated-files.tar.gz

--- NEW FILE: jakarta-commons-javaflow.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 gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}

## 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}

%define section   free
%define base_name commons-javaflow
%define svnrev 618928
%define namedversion 1.0-SNAPSHOT

Name:           jakarta-commons-javaflow
Version:        1.0
Release:        0.r%{svnrev}.1jpp
Epoch:          0
Summary:        Commons JavaFlow
License:        Apache License 2.0
Url:            http://commons.apache.org/sandbox/javaflow/
Group:          Development/Libraries/Java
Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
Source0:        %{base_name}-%{version}-r%{svnrev}.tar.gz
#svn export http://svn.apache.org/repos/asf/commons/sandbox/javaflow/trunk/ %{base_name}-%{version}

Source1:        %{base_name}-settings.xml
Source2:        %{base_name}-commons-sandbox.pom
Source3:        %{base_name}-%{version}-jpp-depmap.xml
Source4:        %{base_name}-autogenerated-files.tar.gz
Source5:        commons-build.tar.gz
Patch0:         %{base_name}-%{version}-site_xml.patch
Patch1:         %{base_name}-%{version}-navigation_xml.patch
Patch2:         %{base_name}-%{version}-pom.patch

BuildRequires:  jpackage-utils >= 0:1.7.4
BuildRequires:  java-devel = 0:1.5.0
BuildRequires:  ant >= 0:1.6.5
BuildRequires:  junit
BuildRequires:  junit-addons
%if %{with_maven}
BuildRequires:  maven2-common-poms
BuildRequires:  maven2 >= 0:2.0.7
BuildRequires:  maven2-default-skin
BuildRequires:  maven2-plugin-ant
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-changelog
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-idea
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-pmd
BuildRequires:  maven2-plugin-project-info-reports
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-site
BuildRequires:  maven2-plugin-surefire
BuildRequires:  maven2-plugin-surefire-report
BuildRequires:  mojo-maven2-plugin-cobertura
BuildRequires:  mojo-maven2-plugin-taglist
%endif

BuildRequires:  asm2 >= 0:2.2.3
BuildRequires:  bcel
BuildRequires:  jakarta-commons-io >= 0:1.3.2
BuildRequires:  jakarta-commons-jci
BuildRequires:  jakarta-commons-logging
BuildRequires:  subversion

Requires:       asm2 >= 0:2.2.3
Requires:       bcel
Requires:       jakarta-commons-io >= 0:1.3.2
Requires:       jakarta-commons-jci
Requires:       jakarta-commons-logging
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot

%description
Sometimes it is useful if we can capture the state of the application, 
its stack of function calls, which includes local variables, the global 
variables and the program counter, and save them into an object. If 
this object would give us the ability to restart the processing from 
the point stored in it. 
A continuation is exactly the type of object that we need. Think of a 
continuation as an object that, for a given point in your program, 
contains a snapshot of the stack trace, including all the local 
variables, and the program counter. You can not only store these 
things in the continuation object, but also restore the execution 
of the program from a continuation object. This means that the stack 
trace and the program counter of the running program become the ones 
stored in a continuation. 
Continuations are powerful concepts from the world of functional 
languages, like Scheme, but they are becoming popular in other 
languages as well. 


%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}.

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

%description manual
%{summary}.
%endif

%prep
%setup -q -n %{base_name}-%{version}
#find . -name "*.jar" -exec rm -f {} \;
for j in $(find . -name "*.jar"); do
    mv $j $j.no
done
cp %{SOURCE1} settings.xml
%if %{without_maven}
gzip -dc %{SOURCE4} | tar xf -
%endif
gzip -dc %{SOURCE5} | tar xf -

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

%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 %{SOURCE2} $MAVEN_REPO_LOCAL/JPP/maven2/default_poms/org.apache.commons-commons-sandbox-parent.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=%{SOURCE3} \
        -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
        ant:ant install javadoc:javadoc site
%else
export CLASSPATH=$(build-classpath \
asm2/asm2 \
asm2/asm2-analysis \
asm2/asm2-commons \
asm2/asm2-tree \
asm2/asm2-util \
bcel \
commons-io \
commons-jci-core \
commons-logging \
)
CLASSPATH=$CLASSPATH:target/classes:target/test-classes
ant -Dmaven.compile.source=1.4 -Dmaven.compile.target=1.5 -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
%endif

%install
rm -rf $RPM_BUILD_ROOT
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
install -m 644 target/javaflow-%{namedversion}.jar \
           $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
%add_to_maven_depmap org.apache.commons javaflow %{version} JPP %{base_name}

(cd $RPM_BUILD_ROOT%{_javadir} && for jar in jakarta-*; do \
ln -sf ${jar} ${jar/jakarta-/}; done)
(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do \
ln -sf ${jar} ${jar/-%{version}/}; done)

# pom
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
install -m 644 pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{base_name}.pom

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

## manual
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%if %{with_maven}
rm -rf target/site/apidocs
cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
%endif

%clean
rm -rf $RPM_BUILD_ROOT

%post javadoc
ln -sf %{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(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/*
%{_datadir}/maven2
%{_mavendepmapfragdir}

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

%if %{with_maven}
%files manual
%defattr(0644,root,root,0755)
%doc %{_docdir}/%{name}-%{version}/site
%endif

%changelog
* Fri Feb 15 2008 Ralph Apel <r.apel at r-apel.de> 0:1.0-0.r618928.1jpp
- 1.0-SNAPSHOT

* Wed Oct 18 2005 Ralph Apel <r.apel at r-apel.de> 0:0.0-0.20051002.1jpp
- First release

--- NEW FILE: commons-javaflow-1.0-navigation_xml.patch ---
--- xdocs/navigation.xml.sav	2008-02-13 16:53:37.000000000 +0100
+++ xdocs/navigation.xml	2008-02-13 16:53:55.000000000 +0100
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE org.apache.commons.menus SYSTEM '../../commons-build/menus/menus.dtd'>
+<!DOCTYPE org.apache.commons.menus SYSTEM '../commons-build/menus/menus.dtd'>
 <project name="Commons&#xA0;JCI">
     <title>Commons&#xA0;Javaflow</title>
     <body>

--- NEW FILE: commons-javaflow-1.0-site_xml.patch ---
--- src/site/site.xml.sav	2008-02-11 18:46:26.000000000 +0100
+++ src/site/site.xml	2008-02-11 18:46:59.000000000 +0100
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <project name="Commons Javaflow">
+  <skin>
+    <groupId>org.apache.maven</groupId>
+    <artifactId>maven-default-skin</artifactId>
+    <version>1.0</version>
+  </skin>
   <bannerRight>
     <name>Commons Javaflow</name>
     <src>images/javaflow-logo-white.png</src>

--- NEW FILE: commons-javaflow-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: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jakarta-commons-javaflow/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	28 May 2008 18:26:59 -0000	1.1
--- sources	28 May 2008 18:27:19 -0000	1.2
***************
*** 0 ****
--- 1,3 ----
+ a9522fe95e0fe85857174b3c19763c97  commons-build.tar.gz
+ fc897a0c732bf3036f4ef4b233b018fb  commons-javaflow-1.0-r618928.tar.gz
+ 0ce028a90917cebf43d10581d74ed461  commons-javaflow-autogenerated-files.tar.gz

--- NEW FILE: commons-javaflow-1.0-pom.patch ---
--- pom.xml.sav2	2008-01-19 10:19:28.000000000 +0100
+++ pom.xml	2008-02-13 18:20:39.000000000 +0100
@@ -162,15 +162,16 @@
       <plugin>     
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>never</forkMode>
+          <forkMode>once</forkMode>
           <includes>
             <include>**/*TestCase.java</include>
           </includes>
           <excludes>
             <exclude>**/Abstract*</exclude>
+            <exclude>**/*Impl.java</exclude>
           </excludes>
           <testFailureIgnore>true</testFailureIgnore>
-          <skip>true</skip>
+          <skip>false</skip>
         </configuration>
       </plugin>
 

--- NEW FILE: commons-javaflow-1.0-jpp-depmap.xml ---
<dependencies>

   <dependency>
      <maven>
         <groupId>junit-addons</groupId>
         <artifactId>junit-addons</artifactId>
         <version>1.4</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>junit-addons</artifactId>
         <version>1.4</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>net.sourceforge.cobertura</groupId>
         <artifactId>cobertura</artifactId>
         <version>1.9</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>cobertura</artifactId>
         <version>1.9</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>urbanophile</groupId>
         <artifactId>java-getopt</artifactId>
         <version>1.0.9</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>gnu-getopt</artifactId>
         <version>1.0.12</version>
      </jpp>
   </dependency>

   <dependency>
      <maven>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-default-skin</artifactId>
         <version>1.0</version>
      </maven>
      <jpp>
         <groupId>JPP/maven2</groupId>
         <artifactId>default-skin</artifactId>
         <version>1.0</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>

   <dependency>
      <maven>
        <groupId>junit</groupId>
        <artifactId>junit</artifactId>
        <version>3.8.2</version>
      </maven>
      <jpp>
        <groupId>JPP</groupId>
        <artifactId>junit</artifactId>
        <version>3.8.2</version>
      </jpp>
   </dependency>

</dependencies>

--- NEW FILE: commons-javaflow-commons-sandbox.pom ---
<?xml version="1.0" encoding="ISO-8859-1"?>
<!--
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.commons</groupId>
    <artifactId>commons-parent</artifactId>
    <version>7</version>
  </parent>
  <groupId>org.apache.commons</groupId>
  <artifactId>commons-sandbox-parent</artifactId>
  <packaging>pom</packaging>
  <!-- TODO: dummy version. In Maven 2.1, this will be auto-versioned being a generic parent -->
  <version>3</version>
  <name>Commons Sandbox Parent</name>
  <url>http://commons.apache.org/sandbox/</url>
  <issueManagement>
    <system>JIRA</system>
    <url>http://issues.apache.org/jira/browse/SANDBOX</url>
  </issueManagement>
  <scm>
    <connection>scm:svn:http://svn.apache.org/repos/asf/commons/proper/commons-sandbox-parent/tags/commons-sandbox-parent-3</connection>
    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/commons/proper/commons-sandbox-parent/tags/commons-sandbox-parent-3</developerConnection>
    <url>http://svn.apache.org/viewvc/commons/proper/commons-sandbox-parent/tags/commons-sandbox-parent-3</url>
  </scm>
  <!-- These reports should be moved to commons-parent some day -->
  <reporting>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-pmd-plugin</artifactId>
        <version>2.3</version>
      </plugin>
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>cobertura-maven-plugin</artifactId>
        <version>2.2</version>
      </plugin>
      <plugin>
        <groupId>org.codehaus.mojo</groupId>
        <artifactId>taglist-maven-plugin</artifactId>
        <version>2.1</version>
        <configuration> 
          <tags>
            <tag>TODO</tag>
            <tag>@todo</tag>
            <tag>FIXME</tag>
          </tags>
          <aggregate>true</aggregate>
        </configuration> 
      </plugin>
    </plugins>
  </reporting>
  <distributionManagement>
    <site>
      <id>apache.website</id>
      <url>${commons.deployment.protocol}://people.apache.org/www/commons.apache.org/sandbox/</url>
    </site>
  </distributionManagement>
</project>





More information about the JPackage-commits mailing list