[Jpackage-commits] dist/dsol/devel .cvsignore, 1.1, 1.2 dsol-1.6.9-dsol-pom.patch, NONE, 1.1 dsol-jpp-depmap.xml, NONE, 1.1 dsol-settings.xml, NONE, 1.1 dsol.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Sat Jun 26 10:26:21 CEST 2010


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

Modified Files:
	.cvsignore sources 
Added Files:
	dsol-1.6.9-dsol-pom.patch dsol-jpp-depmap.xml 
	dsol-settings.xml dsol.spec 
Log Message:
Import dsol into devel

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/dsol/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	26 Jun 2010 08:23:20 -0000	1.1
--- .cvsignore	26 Jun 2010 08:26:18 -0000	1.2
***************
*** 0 ****
--- 1,5 ----
+ dsol-1.6.9.tgz
+ dsol-examples-1.6.9.tgz
+ dsol-gui-1.6.9.tgz
+ dsol-tutorial-1.6.9.tgz
+ dsol-xml-1.6.9.tgz

--- NEW FILE: dsol-1.6.9-dsol-pom.patch ---
--- dsol-1.6.9/pom.xml.sav	2010-06-03 18:00:21.000000000 +0200
+++ dsol-1.6.9/pom.xml	2010-06-03 18:01:23.000000000 +0200
@@ -32,6 +32,11 @@
     </dependency>
     <dependency>
       <groupId>dsol</groupId>
+      <artifactId>event</artifactId>
+      <version>1.6.9</version>
+    </dependency>
+    <dependency>
+      <groupId>dsol</groupId>
       <artifactId>logger</artifactId>
       <version>1.6.9</version>
     </dependency>
@@ -47,6 +52,11 @@
     </dependency>
     <dependency>
       <groupId>dsol</groupId>
+      <artifactId>introspection</artifactId>
+      <version>1.6.9</version>
+    </dependency>
+    <dependency>
+      <groupId>dsol</groupId>
       <artifactId>interpreter</artifactId>
       <version>1.6.9</version>
     </dependency>
@@ -317,4 +327,4 @@
     </site>
   </distributionManagement>
   
-</project>
\ No newline at end of file
+</project>

--- NEW FILE: dsol-jpp-depmap.xml ---
<dependencies>
<!--
-->
    <dependency>
        <maven>
            <groupId>jcommon</groupId>
            <artifactId>jcommon</artifactId>
            <version>0.9.5</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>jcommon</artifactId>
            <version>1.0.16</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>java3d</groupId>
            <artifactId>j3d-core</artifactId>
            <version>1.3.1</version>
        </maven>
        <jpp>
            <groupId>JPP/java3d</groupId>
            <artifactId>j3dcore</artifactId>
            <version>1.5.2</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>java3d</groupId>
            <artifactId>vecmath</artifactId>
            <version>1.3.1</version>
        </maven>
        <jpp>
            <groupId>JPP/java3d</groupId>
            <artifactId>vecmath</artifactId>
            <version>1.5.2</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>java3d</groupId>
            <artifactId>j3d-core-utils</artifactId>
            <version>1.3.1</version>
        </maven>
        <jpp>
            <groupId>JPP/java3d</groupId>
            <artifactId>j3dutils</artifactId>
            <version>1.5.2</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>colt</groupId>
            <artifactId>colt</artifactId>
            <version>1.0.3</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>colt</artifactId>
            <version>1.2.0</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>jfreechart</groupId>
            <artifactId>jfreechart</artifactId>
            <version>0.9.20</version>
        </maven>
<!--
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>jfreechart0</artifactId>
            <version>0.9.21</version>
        </jpp>
-->
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>jfreechart</artifactId>
            <version>1.0.13</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>math</groupId>
            <artifactId>math</artifactId>
            <version>1.0.0</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>commons-math</artifactId>
            <version>2.0</version>
        </jpp>
    </dependency>

    <dependency>
        <maven>
            <groupId>sax</groupId>
            <artifactId>sax</artifactId>
            <version>2.0.1</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>sax2</artifactId>
            <version>2.0</version>
        </jpp>
    </dependency>


    <dependency>
        <maven>
            <groupId>gisbeans</groupId>
            <artifactId>gisbeans</artifactId>
            <version>1.0.0-beta4</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>gisbeans</artifactId>
            <version>1.0.0</version>
        </jpp>
    </dependency>

    <dependency>
        <maven>
            <groupId>jlfgr</groupId>
            <artifactId>jlfgr</artifactId>
            <version>1.0</version>
        </maven>
        <jpp>
		<groupId>JPP/maven2</groupId>
            <artifactId>empty-dep</artifactId>
            <version>1.0</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>jgoodies</groupId>
            <artifactId>looks</artifactId>
            <version>1.2.2</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>jgoodies-looks</artifactId>
            <version>2.1.4</version>
        </jpp>
    </dependency>
    <dependency>
        <maven>
            <groupId>tablelayout</groupId>
            <artifactId>TableLayout</artifactId>
            <version>20020517</version>
        </maven>
        <jpp>
            <groupId>JPP</groupId>
            <artifactId>tablelayout</artifactId>
            <version>0.0</version>
        </jpp>
    </dependency>


</dependencies>

--- NEW FILE: dsol-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: dsol.spec ---
# Copyright (c) 2000-2010, 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.
#

Name:           dsol
Version:        1.6.9
Release:        1%{?dist}
Summary:        Java D-SOL simulation library

Group:          Development/Libraries
License:        LGPL
URL:            http://sk-3.tbm.tudelft.nl/simulation/index.php

Source0:        dsol-1.6.9.tgz
# cvs -d :pserver:dsoluser at sk-3.tbm.tudelft.nl:/home/dsol/1.6 login
# cvs -d :pserver:dsoluser at sk-3.tbm.tudelft.nl:/home/dsol/1.6 export -r HEAD -d dsol-1.6.9 dsol 
# tar czf dsol-1.6.9.tgz dsol-1.6.9
Source1:        dsol-examples-1.6.9.tgz
# cvs -d :pserver:dsoluser at sk-3.tbm.tudelft.nl:/home/dsol/1.6 export -r HEAD -d dsol-examples-1.6.9 dsol-examples 
# tar czf dsol-examples-1.6.9.tgz dsol-examples-1.6.9
Source2:        dsol-gui-1.6.9.tgz
# cvs -d :pserver:dsoluser at sk-3.tbm.tudelft.nl:/home/dsol/1.6 export -r HEAD -d dsol-gui-1.6.9 dsol-gui 
# tar czf dsol-examples-1.6.9.tgz dsol-examples-1.6.9
Source3:       dsol-tutorial-1.6.9.tgz
# cvs -d :pserver:dsoluser at sk-3.tbm.tudelft.nl:/home/dsol/1.6 export -r HEAD -d dsol-tutorial-1.6.9 dsol-tutorial
# tar czf dsol-tutorial-1.6.9.tgz dsol-tutorial-1.6.9
Source4:       dsol-xml-1.6.9.tgz
# cvs -d :pserver:dsoluser at sk-3.tbm.tudelft.nl:/home/dsol/1.6 export -r HEAD -d dsol-xml-1.6.9 dsol-xml
# tar czf dsol-xml-1.6.9.tgz dsol-xml-1.6.9

Source11:       %{name}-settings.xml
Source12:       %{name}-jpp-depmap.xml 
Patch0:         dsol-1.6.9-dsol-pom.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  maven2 >= 2.0.8
BuildRequires:  java-devel >= 1.6.0
BuildRequires:  jpackage-utils >= 0:5.0.0
BuildRequires:  dsol-basic
BuildRequires:  gisbeans
BuildRequires:  jgoodies-looks
#BuildRequires:  jlfgr
BuildRequires:  tablelayout

Requires:  java >= 1.6.0
Requires:  jpackage-utils >= 0:5.0.0
Requires:  dsol-basic
Requires:  gisbeans
Requires:  jgoodies-looks
Requires:  jlfgr
Requires:  tablelayout

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

BuildArch:      noarch

%description
DSOL is an open source, Java based suite of Java classes for
multi-formalism (e.g. continuous, discrete event, flow, 
process, and agent-based) simulation. The first release of 
DSOL was introduced at IEEE's Winter Simulation Conference 
2002. The multi-formalism aspects and distributed character 
make DSOL an excellent Java library for web-based simulations, 
distributed simulation projects, and simulation games.

%package javadoc 
Summary:        Javadocs for %{name} 
Group:          Documentation 
Requires:       %{name} = %{version}-%{release} 
 
%description javadoc 
%{summary}. 

%prep
%setup -q -c
gzip -dc %{SOURCE1} | tar xf -
gzip -dc %{SOURCE2} | tar xf -
gzip -dc %{SOURCE3} | tar xf -
gzip -dc %{SOURCE4} | tar xf -
cp -p %{SOURCE11} settings.xml
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
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
%patch0 -b .sav
mkdir external_repo
ln -s %{_javadir} external_repo/JPP

%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p ${MAVEN_REPO_LOCAL}
export MAVEN_OPTS="-Dmaven2.jpp.mode=true -Dmaven2.jpp.depmap.file=%{SOURCE12} -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Djava.awt.headless=true -Daggregate=true"
pushd dsol-%{version}
%{_bindir}/mvn-jpp \
        -e \
        -s $(pwd)/settings.xml \
        install javadoc:javadoc
popd
for module in \
	xml \
	gui \
	examples \
	tutorial \
	; do
pushd dsol-${module}-%{version}
%{_bindir}/mvn-jpp \
        -e \
        -s $(pwd)/settings.xml \
        install javadoc:javadoc
popd
done

%install
%__rm -rf %{buildroot}

# jar
%__mkdir_p %{buildroot}%{_javadir}/%{name}
%__install -m 644 %{name}-%{version}/target/%{name}-%{version}.jar \
               %{buildroot}%{_javadir}/%{name}
%__install -m 644 %{name}-examples-%{version}/target/%{name}-examples-%{version}.jar \
               %{buildroot}%{_javadir}/%{name}
%__install -m 644 %{name}-gui-%{version}/target/%{name}-gui-%{version}.jar \
               %{buildroot}%{_javadir}/%{name}
%__install -m 644 %{name}-tutorial-%{version}/target/%{name}-tutorial-%{version}.jar \
               %{buildroot}%{_javadir}/%{name}
%__install -m 644 %{name}-xml-%{version}/target/%{name}-xml-%{version}.jar \
               %{buildroot}%{_javadir}/%{name}
(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do \
%__ln_s ${jar} ${jar/-%{version}/}; done)

# poms
%__mkdir_p %{buildroot}%{_datadir}/maven2/poms
%__install -m 644 %{name}-%{version}/pom.xml \
               $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}.pom
%add_to_maven_depmap %{name} %{name} %{version} JPP/%{name} %{name}
%__install -m 644 %{name}-examples-%{version}/pom.xml \
               $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-examples.pom
%add_to_maven_depmap %{name} %{name}-examples %{version} JPP/%{name} %{name}-examples
%__install -m 644 %{name}-gui-%{version}/pom.xml \
               $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-gui.pom
%add_to_maven_depmap %{name} %{name}-gui %{version} JPP/%{name} %{name}-gui
%__install -m 644 %{name}-tutorial-%{version}/pom.xml \
               $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-tutorial.pom
%add_to_maven_depmap %{name} %{name}-tutorial %{version} JPP/%{name} %{name}-tutorial
%__install -m 644 %{name}-xml-%{version}/pom.xml \
               $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-%{name}-xml.pom
%add_to_maven_depmap %{name} %{name}-xml %{version} JPP/%{name} %{name}-xml

# javadoc 
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version} 
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}
%__cp -a %{name}-%{version}/target/site/apidocs/* \
               %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}-examples
%__cp -a %{name}-examples-%{version}/target/site/apidocs/* \
               %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}-examples
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}-gui
%__cp -a %{name}-gui-%{version}/target/site/apidocs/* \
               %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}-gui
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}-tutorial
%__cp -a %{name}-tutorial-%{version}/target/site/apidocs/* \
               %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}-tutorial
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}-xml
%__cp -a %{name}-xml-%{version}/target/site/apidocs/* \
               %{buildroot}%{_javadocdir}/%{name}-%{version}/%{name}-xml
%__ln_s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} 

%clean
%__rm -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(-,root,root,-)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*

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

%changelog
* Sat Jun 26 2010 Ralph Apel <r.apel at r-apel.de> 1.6.9-1
- First release


Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/dsol/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	26 Jun 2010 08:23:20 -0000	1.1
--- sources	26 Jun 2010 08:26:18 -0000	1.2
***************
*** 0 ****
--- 1,5 ----
+ ef2c4c276d9f7be5564a7b9130f7f2a7  dsol-1.6.9.tgz
+ 7fd1fd7dbee80f3ab91fab666ed369c8  dsol-examples-1.6.9.tgz
+ 1456ced83fb7dc493d28cd1f8caf93e6  dsol-gui-1.6.9.tgz
+ 131af24141647ee4e20ca6fb20ba7d9b  dsol-tutorial-1.6.9.tgz
+ 9df5a75c295113a391c18899a4a41f31  dsol-xml-1.6.9.tgz




More information about the JPackage-commits mailing list