[Jpackage-commits] dist/docbook-maven/devel .cvsignore, 1.1, 1.2 docbook-component-info.xml, NONE, 1.1 docbook-fo-editor-build.patch, NONE, 1.1 docbook-jpp-depmap.xml, NONE, 1.1 docbook-maven.spec, NONE, 1.1 docbook-settings.xml, NONE, 1.1 sources, 1.1, 1.2

David Walluck david at ryu.zarb.org
Thu Dec 2 08:39:40 CET 2010


Update of /home/projects/jpackage/cvs/dist/docbook-maven/devel
In directory ryu.zarb.org:/tmp/cvs-serv14405/devel

Modified Files:
	.cvsignore sources 
Added Files:
	docbook-component-info.xml docbook-fo-editor-build.patch 
	docbook-jpp-depmap.xml docbook-maven.spec docbook-settings.xml 
Log Message:
- initial import

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/docbook-maven/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	2 Dec 2010 07:21:33 -0000	1.1
--- .cvsignore	2 Dec 2010 07:39:37 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ docbook-5.0.tar.bz2

--- NEW FILE: docbook-jpp-depmap.xml ---
<dependencies>
 <dependency>
   <maven>
     <groupId>saxon</groupId>
     <artifactId>saxon</artifactId>
     <version>6.5.3</version>
   </maven>
   <jpp>
     <groupId>JPP</groupId>
     <artifactId>saxon</artifactId>
     <version>6.5.5</version>
   </jpp>
 </dependency>
</dependencies>

--- NEW FILE: docbook-maven.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.
#

%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}

%define section free

Name:           docbook-maven
Version:        5.0
Release:        1%{?dist}
Epoch:          0
Summary:        Java support for Docbook
License:        LGPLv2+
Group:          Development/Java
URL:            http://www.jboss.org/
# svn export https://docbook.svn.sourceforge.net/svnroot/docbook/trunk docbook-5.0 && tar cjf docbook-5.0.tar.bz2 docbook-5.0
# Exported revision 8940.
Source0:        docbook-5.0.tar.bz2
Source1:        docbook-jpp-depmap.xml
Source2:        docbook-settings.xml
Source3:        docbook-component-info.xml
Patch0:         docbook-fo-editor-build.patch
Requires(post): jpackage-utils >= 0:1.7.3
Requires(postun): jpackage-utils >= 0:1.7.3
BuildRequires:  maven2 >= 0:2.0.7
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources
BuildRequires:  maven2-plugin-source
BuildRequires:  maven-doxia-sitetools
BuildRequires:  maven-release
BuildRequires:  maven-surefire-maven-plugin
BuildRequires:  saxon >= 0:6.5.3
BuildRequires:  xalan-j2 >= 0:2.7
BuildArch:      noarch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root

%description
Java support for Docbook.

%package -n docbook-xml
Summary:        DocBook XML
Version:        5.0
Epoch:          0
Group:          Development/Java
Requires:       docbook-maven = 0:5.0

%description -n docbook-xml
DocBook XML.

%package -n docbook-xsl
Summary:        XSL stylesheets for transforming DocBook XML document instances
Version:        1.75.2
Epoch:          0
Group:          Development/Java
Requires:       docbook-maven = 0:5.0

%description -n docbook-xsl
These are XSL stylesheets for transforming DocBook XML document instances into
various output formats.

%package -n docbook-xsl-saxon
Summary:        Java extensions for use with the DocBook XML stylesheets Saxon
Version:        1.0.0
Epoch:          0
Group:          Development/Java
Requires:       docbook-maven = 0:5.0
Requires:       saxon >= 0:6.5.3

%description -n docbook-xsl-saxon
These are Java extensions for use with the DocBook XML stylesheets and the
Saxon XSLT engine.

%package -n docbook-xsl-xalan
Summary:        Java extensions for use with the DocBook XML stylesheets and Xalan-Java
Version:        1.0.0
Epoch:          0
Group:          Development/Java
Requires:       docbook-maven = 0:5.0
Requires:       xalan-j2 >= 0:2.7

%description -n docbook-xsl-xalan
These are Java extensions for use with the DocBook XML stylesheets and the
Xalan-Java XSLT engine.

%package -n fo-editor
Summary:        DocBook FO editor
Version:        1.0.1
Epoch:          0
Group:          Development/Java

%description -n fo-editor
DocBook FO editor.

%package -n fo-editor-javadoc
Summary:        Javadoc for fo-editor
Version:        1.0.1
Epoch:          0
Group:          Development/Documentation
Requires:       jpackage-utils

%description -n fo-editor-javadoc
Javadoc for fo-editor.

%prep
%setup -q -n docbook-5.0
%patch0 -p0 -b .sav0
%{_bindir}/find -type f -name "*.jar" | %{_bindir}/xargs -t %{__rm}

pushd maven
%{__cp} -p %{SOURCE2} maven2-settings.xml

%{__sed} -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
%{__sed} -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" maven2-settings.xml
%{__sed} -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml
%{__sed} -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" maven2-settings.xml
%{__sed} -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" maven2-settings.xml

%{__mkdir_p} external_repo
%{__ln_s} %{_javadir} external_repo/JPP
popd

%build
pushd maven
export M2SETTINGS=$(pwd)/maven2-settings.xml
export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository
%{_bindir}/mvn-jpp -e \
        -s ${M2SETTINGS} \
        -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
        -Dmaven2.jpp.depmap.file=%{SOURCE1} \
        install
popd

pushd contrib/tools/fo-editor
export CLASSPATH=$(build-classpath log4j)
export OPT_JAR_LIST=:
%{ant} -Dbuild.sysclasspath=first compile javadoc dist_zip
popd

%install
%define version 5.0

%{__rm} -rf %{buildroot}
%{__mkdir_p} %{buildroot}%{_javadir}
%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms

%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook/5.0/docbook-5.0.pom %{buildroot}%{_datadir}/maven2/poms/JPP-docbook.pom
%add_to_maven_depmap net.sf.docbook docbook 5.0 JPP docbook

%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook-xml/5.0-all/docbook-xml-5.0-all.pom %{buildroot}%{_datadir}/maven2/poms/JPP-docbook-xml.pom
%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook-xml/5.0-all/docbook-xml-5.0-all-resources.zip %{buildroot}%{_javadir}/docbook-xml-5.0-all-resources.zip
%add_to_maven_depmap net.sf.docbook docbook-xml 5.0-all JPP docbook-xml

%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook-xsl/1.75.2/docbook-xsl-1.75.2.pom %{buildroot}%{_datadir}/maven2/poms/JPP-docbook-xsl.pom
%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook-xsl/1.75.2/docbook-xsl-1.75.2-ns-resources.zip %{buildroot}%{_javadir}/docbook-xsl-1.75.2-ns-resources.zip
%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook-xsl/1.75.2/docbook-xsl-1.75.2-resources.zip %{buildroot}%{_javadir}/docbook-xsl-1.75.2-resources.zip
%add_to_maven_depmap net.sf.docbook docbook-xsl 1.75.2 JPP docbook-xsl

%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook-xsl-saxon/1.0.0/docbook-xsl-saxon-1.0.0.pom %{buildroot}%{_datadir}/maven2/poms/JPP-docbook-xsl-saxon.pom
%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook-xsl-saxon/1.0.0/docbook-xsl-saxon-1.0.0.jar %{buildroot}%{_javadir}/docbook-xsl-saxon-1.0.0.jar
%{__ln_s} docbook-xsl-saxon-1.0.0.jar %{buildroot}%{_javadir}/docbook-xsl-saxon.jar
%add_to_maven_depmap net.sf.docbook docbook-xsl-saxon 1.0.0 JPP docbook-xsl-saxon

%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook-xsl-xalan/1.0.0/docbook-xsl-xalan-1.0.0.pom %{buildroot}%{_datadir}/maven2/poms/JPP-docbook-xsl-xalan.pom
%{__cp} -p maven/m2_repo/repository/net/sf/docbook/docbook-xsl-xalan/1.0.0/docbook-xsl-xalan-1.0.0.jar %{buildroot}%{_javadir}/docbook-xsl-xalan-1.0.0.jar
%{__ln_s} docbook-xsl-xalan-1.0.0.jar %{buildroot}%{_javadir}/docbook-xsl-xalan.jar
%add_to_maven_depmap net.sf.docbook docbook-xsl-xalan 1.0.0 JPP docbook-xsl-xalan

%{__mkdir_p} %{buildroot}%{_datadir}/fo-editor
%{__cp} -pr contrib/tools/fo-editor/dist/* %{buildroot}%{_datadir}/fo-editor

# javadoc
%{__mkdir_p} %{buildroot}%{_javadocdir}/fo-editor-1.0.1
%{__cp} -pr contrib/tools/fo-editor/doc/* %{buildroot}%{_javadocdir}/fo-editor-1.0.1
%{__ln_s} fo-editor-1.0.1 %{buildroot}%{_javadocdir}/fo-editor

%clean
%{__rm} -rf %{buildroot}

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%{_datadir}/maven2/poms/JPP-docbook.pom
%{_mavendepmapfragdir}/%{name}

%files -n docbook-xml
%defattr(0644,root,root,0755)
%{_datadir}/maven2/poms/JPP-docbook-xml.pom
%{_javadir}/docbook-xml-5.0-all-resources.zip

%files -n docbook-xsl
%defattr(0644,root,root,0755)
%{_datadir}/maven2/poms/JPP-docbook-xsl.pom
%{_javadir}/docbook-xsl-1.75.2-ns-resources.zip
%{_javadir}/docbook-xsl-1.75.2-resources.zip

%files -n docbook-xsl-saxon
%defattr(0644,root,root,0755)
%{_datadir}/maven2/poms/JPP-docbook-xsl-saxon.pom
%{_javadir}/docbook-xsl-saxon-1.0.0.jar
%{_javadir}/docbook-xsl-saxon.jar

%files -n docbook-xsl-xalan
%defattr(0644,root,root,0755)
%{_datadir}/maven2/poms/JPP-docbook-xsl-xalan.pom
%{_javadir}/docbook-xsl-xalan-1.0.0.jar
%{_javadir}/docbook-xsl-xalan.jar

%files -n fo-editor
%defattr(0644,root,root,0755)
%dir %{_datadir}/fo-editor
%doc %{_datadir}/fo-editor/README
%{_datadir}/fo-editor/FOeditor.jar
%{_datadir}/fo-editor/configuration/attributes.xml
%{_datadir}/fo-editor/configuration/config.xml
%{_datadir}/fo-editor/configuration/graphics.xml
%{_datadir}/fo-editor/configuration/types.xml
%{_datadir}/fo-editor/run.bat
%{_datadir}/fo-editor/run.sh
%{_datadir}/fo-editor/templates/template.xml

%files -n fo-editor-javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/fo-editor-1.0.1
%{_javadocdir}/fo-editor

%changelog
* Thu Dec 02 2010 David Walluck <dwalluck at redhat.com> 0:5.0-1
- release

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/docbook-maven/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	2 Dec 2010 07:21:33 -0000	1.1
--- sources	2 Dec 2010 07:39:38 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ 6f1e11beefba65abf0733b9c9f636fcf  docbook-5.0.tar.bz2

--- NEW FILE: docbook-component-info.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<project name="">
  <component id="docbook"
             licenseType=""
             version="@VERSION@"
             tag="@TAG@"
             description=""
             
             > 
              
    <artifact id="docbook.jar"/>


    <export>
      <include input="docbook.jar"/>

    </export>
  </component>
</project>

--- NEW FILE: docbook-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: docbook-fo-editor-build.patch ---
--- contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/graphics/frames/HelpFrame.java.orig	2007-10-21 09:48:11.000000000 -0400
+++ contrib/tools/fo-editor/src/cz/zcu/fav/kiv/editor/graphics/frames/HelpFrame.java	2009-10-28 11:46:34.098806362 -0400
@@ -2,8 +2,8 @@
 
 import java.net.URL;
 
-import javax.help.HelpBroker;
-import javax.help.HelpSet;
+//import javax.help.HelpBroker;
+//import javax.help.HelpSet;
 
 import cz.zcu.fav.kiv.editor.controller.logger.Log;
 import cz.zcu.fav.kiv.editor.controller.options.OptionItems;
@@ -18,10 +18,10 @@
     private static final String HELPSET = "jhelpset.hs";
 
     /** The help set */
-    private HelpSet helpSet;
+    //private HelpSet helpSet;
 
     /** The help broker */
-    private HelpBroker helpBroker;
+    //private HelpBroker helpBroker;
 
     /** The single instance of the frame */
     private static HelpFrame instance;
@@ -47,26 +47,26 @@
      * Creates the new help content according to the actual application language locale.
      */
     public void createHelp() {
-        if ((helpSet != null) && (!helpSet.getLocale().equals(OptionItems.LANGUAGE)))
-            helpSet = null;
-        if (helpSet == null) {
-            createHelpSet();
-            helpBroker = helpSet.createHelpBroker();
-        }
-        helpBroker.setDisplayed(true);
+        //if ((helpSet != null) && (!helpSet.getLocale().equals(OptionItems.LANGUAGE)))
+        //    helpSet = null;
+        //if (helpSet == null) {
+        //    createHelpSet();
+        //     helpBroker = helpSet.createHelpBroker();
+        //}
+        //helpBroker.setDisplayed(true);
     }
 
     /**
      * Initializes the help set according to the file jhelpset.hs.
      */
     private void createHelpSet() {
-        ClassLoader loader = this.getClass().getClassLoader();
-        try {
-            URL url = HelpSet.findHelpSet(loader, HELPSET);
-            helpSet = new HelpSet(null, url);
-        } catch (Exception ex) {
-            Log.error(ex);
-        }
+        //ClassLoader loader = this.getClass().getClassLoader();
+        //try {
+        //    URL url = HelpSet.findHelpSet(loader, HELPSET);
+        //    helpSet = new HelpSet(null, url);
+        //} catch (Exception ex) {
+        //    Log.error(ex);
+        //}
     }
 
 }
--- contrib/tools/fo-editor/build.xml.orig	2007-12-17 08:56:23.000000000 -0500
+++ contrib/tools/fo-editor/build.xml	2009-10-28 11:54:26.638806368 -0400
@@ -86,11 +86,15 @@
 	    <jar jarfile="${dist}/${name}.jar" basedir="${build}">
 	    	<manifest>
 	    	    <attribute name="Main-Class" value="${main}"/>	
+<!--
 	    		<attribute name="Class-Path" value="log4j-1.2.14.jar" />
+-->
 	    	</manifest>
+<!--
 	    	<zipfileset src="${lib}/log4j-1.2.14.jar"/>	
 	    	<zipfileset src="${lib}/jh.jar"/>
 	    	<zipfileset src="${lib}/help.jar"/>
+-->
 		</jar>
 	</target>	
 	




More information about the JPackage-commits mailing list