Skip to content

Commit

Permalink
Merge branch 'develop' for release 0.1.1
Browse files Browse the repository at this point in the history
# Conflicts:
#	.gitignore
  • Loading branch information
contrext committed Oct 13, 2016
2 parents 12824cf + 6a3c8cc commit dbf06eb
Show file tree
Hide file tree
Showing 120 changed files with 1,010,179 additions and 12 deletions.
13 changes: 1 addition & 12 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
*.class
.idea/

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.ear

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
lib/
255 changes: 255 additions & 0 deletions build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,255 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="org.dita-community.i18n" default="all">

<property file=".build.properties" />
<property file="build.properties"/>
<property file="version.properties"/>

<property file="new-build.properties"/>
<!-- Uncomment the following property if no tests compilation is needed -->
<!--
<property name="skip.tests" value="true"/>
-->

<property name="plugin.dir" value="${basedir}/plugin"/>
<property name="package.dir" value="${basedir}/dist"/>

<!-- Compiler options -->

<property name="compiler.debug" value="on"/>
<property name="compiler.generate.no.warnings" value="off"/>
<property name="compiler.args" value=""/>
<property name="compiler.max.memory" value="700m"/>
<patternset id="ignored.files">
<exclude name="**/*.hprof/**"/>
<exclude name="**/*.pyc/**"/>
<exclude name="**/*.pyo/**"/>
<exclude name="**/*.rbc/**"/>
<exclude name="**/*.yarb/**"/>
<exclude name="**/*~/**"/>
<exclude name="**/.DS_Store/**"/>
<exclude name="**/.git/**"/>
<exclude name="**/.hg/**"/>
<exclude name="**/.svn/**"/>
<exclude name="**/CVS/**"/>
<exclude name="**/RCS/**"/>
<exclude name="**/SCCS/**"/>
<exclude name="**/__pycache__/**"/>
<exclude name="**/_svn/**"/>
<exclude name="**/rcs/**"/>
<exclude name="**/vssver.scc/**"/>
<exclude name="**/vssver2.scc/**"/>
</patternset>
<patternset id="library.patterns">
<include name="*.war"/>
<include name="*.swc"/>
<include name="*.apk"/>
<include name="*.zip"/>
<include name="*.ear"/>
<include name="*.egg"/>
<include name="*.ane"/>
<include name="*.jar"/>
</patternset>
<patternset id="compiler.resources">
<exclude name="**/?*.java"/>
<exclude name="**/?*.form"/>
<exclude name="**/?*.class"/>
<exclude name="**/?*.groovy"/>
<exclude name="**/?*.scala"/>
<exclude name="**/?*.flex"/>
<exclude name="**/?*.kt"/>
<exclude name="**/?*.clj"/>
<exclude name="**/?*.aj"/>
</patternset>

<!-- JDK definitions -->

<property name="jdk.bin.1.7" value="${jdk.home.1.7}/bin"/>
<path id="jdk.classpath.1.7">
<fileset dir="${jdk.home.1.7}">
<include name="jre/lib/charsets.jar"/>
<include name="jre/lib/deploy.jar"/>
<include name="jre/lib/ext/dnsns.jar"/>
<include name="jre/lib/ext/localedata.jar"/>
<include name="jre/lib/ext/sunec.jar"/>
<include name="jre/lib/ext/sunjce_provider.jar"/>
<include name="jre/lib/ext/sunpkcs11.jar"/>
<include name="jre/lib/ext/zipfs.jar"/>
<include name="jre/lib/htmlconverter.jar"/>
<include name="jre/lib/javaws.jar"/>
<include name="jre/lib/jce.jar"/>
<include name="jre/lib/jfr.jar"/>
<include name="jre/lib/jfxrt.jar"/>
<include name="jre/lib/jsse.jar"/>
<include name="jre/lib/management-agent.jar"/>
<include name="jre/lib/plugin.jar"/>
<include name="jre/lib/resources.jar"/>
<include name="jre/lib/rt.jar"/>
<include name="lib/ant-javafx.jar"/>
<include name="lib/dt.jar"/>
<include name="lib/javafx-doclet.jar"/>
<include name="lib/javafx-mx.jar"/>
<include name="lib/jconsole.jar"/>
<include name="lib/sa-jdi.jar"/>
<include name="lib/tools.jar"/>
</fileset>
</path>

<property name="project.jdk.home" value="${jdk.home.1.7}"/>
<property name="project.jdk.bin" value="${jdk.bin.1.7}"/>
<property name="project.jdk.classpath" value="jdk.classpath.1.7"/>


<!-- Project Libraries -->

<path id="library.lib.classpath">
<fileset dir="${basedir}/lib">
<patternset refid="library.patterns"/>
</fileset>
</path>

<!-- Modules -->


<!-- Module org.dita-community.i18n -->

<dirname property="module.org.dita-community.i18n.basedir" file="${ant.file}"/>


<property name="module.jdk.home.org.dita-community.i18n" value="${project.jdk.home}"/>
<property name="module.jdk.bin.org.dita-community.i18n" value="${project.jdk.bin}"/>
<property name="module.jdk.classpath.org.dita-community.i18n" value="${project.jdk.classpath}"/>

<property name="compiler.args.org.dita-community.i18n" value="-encoding UTF-8 -source 1.7 -target 1.7 ${compiler.args}"/>

<property name="org.dita-community.i18n.output.dir" value="${module.org.dita-community.i18n.basedir}/target/classes/production/org.dita-community.i18n"/>
<property name="org.dita-community.i18n.testoutput.dir" value="${module.org.dita-community.i18n.basedir}/target/classes/test/org.dita-community.i18n"/>

<path id="org.dita-community.i18n.module.bootclasspath">
<!-- Paths to be included in compilation bootclasspath -->
</path>

<path id="org.dita-community.i18n.module.production.classpath">
<path refid="${module.jdk.classpath.org.dita-community.i18n}"/>
<path refid="library.lib.classpath"/>
</path>

<path id="org.dita-community.i18n.runtime.production.module.classpath">
<pathelement location="${org.dita-community.i18n.output.dir}"/>
<path refid="library.lib.classpath"/>
</path>

<path id="org.dita-community.i18n.module.classpath">
<path refid="${module.jdk.classpath.org.dita-community.i18n}"/>
<pathelement location="${org.dita-community.i18n.output.dir}"/>
<path refid="library.lib.classpath"/>
</path>

<path id="org.dita-community.i18n.runtime.module.classpath">
<pathelement location="${org.dita-community.i18n.testoutput.dir}"/>
<pathelement location="${org.dita-community.i18n.output.dir}"/>
<path refid="library.lib.classpath"/>
</path>


<patternset id="excluded.from.module.org.dita-community.i18n">
<patternset refid="ignored.files"/>
</patternset>

<patternset id="excluded.from.compilation.org.dita-community.i18n">
<patternset refid="excluded.from.module.org.dita-community.i18n"/>
</patternset>

<path id="org.dita-community.i18n.module.sourcepath">
<dirset dir="${module.org.dita-community.i18n.basedir}">
<include name="src/main/java"/>
</dirset>
</path>


<target name="compile.module.org.dita-community.i18n" depends="compile.module.org.dita-community.i18n.production,compile.module.org.dita-community.i18n.tests" description="Compile module org.dita-community.i18n"/>

<target name="compile.module.org.dita-community.i18n.production" description="Compile module org.dita-community.i18n; production classes">
<mkdir dir="${org.dita-community.i18n.output.dir}"/>
<javac destdir="${org.dita-community.i18n.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true" executable="${module.jdk.bin.org.dita-community.i18n}/javac">
<compilerarg line="${compiler.args.org.dita-community.i18n}"/>
<bootclasspath refid="org.dita-community.i18n.module.bootclasspath"/>
<classpath refid="org.dita-community.i18n.module.production.classpath"/>
<src refid="org.dita-community.i18n.module.sourcepath"/>
<patternset refid="excluded.from.compilation.org.dita-community.i18n"/>
</javac>

<copy todir="${org.dita-community.i18n.output.dir}">
<fileset dir="${module.org.dita-community.i18n.basedir}/src/main/java">
<patternset refid="compiler.resources"/>
<type type="file"/>
</fileset>
</copy>
</target>

<target name="compile.module.org.dita-community.i18n.tests" depends="compile.module.org.dita-community.i18n.production" description="compile module org.dita-community.i18n; test classes" unless="skip.tests"/>

<target name="clean.module.org.dita-community.i18n" description="cleanup module">
<delete dir="${org.dita-community.i18n.output.dir}"/>
<delete dir="${org.dita-community.i18n.testoutput.dir}"/>
<delete dir="${package.dir}"/>
</target>

<target name="init" description="Build initialization">
<!-- Perform any build initialization in this target -->
<tstamp/>
</target>

<target name="clean" depends="clean.module.org.dita-community.i18n" description="cleanup all">
</target>

<target name="build.modules" depends="init, clean, compile.module.org.dita-community.i18n" description="build all modules"/>

<target name="jar" depends="build.modules">
<delete failonerror="false" dir="${basedir}/target/lib">
<include name="*.jar"/>
</delete>
<jar destfile="${basedir}/target/lib/dita-community-i18n-saxon91.jar">
<fileset dir="${basedir}/target/classes/production/org.dita-community.i18n" >
<exclude name="**/*96.*"/>
<include name="**.*" />
<include name="**/**.*" />
</fileset>
<fileset dir="${basedir}/src/main/java">
<include name="**/resources/**.*" />
</fileset>

</jar>
</target>

<target name="all" depends="build.modules" description="build all"/>

<target name="package" depends="jar"
description="Package the OT plugin for distribution"
>
<copy todir="${package.dir}/plugins/org.dita-community.i18n">
<fileset dir="${plugin.dir}">
<include name="**/*"/>
</fileset>
<fileset dir="${basedir}/target">
<include name="lib/*.jar"/>
</fileset>
</copy>
</target>

<target name="dist" depends="package">
<zip basedir="${package.dir}/plugins" destfile="${package.dir}/org_dita-community_i18n_plugin_${version}.zip">
<include name="org.dita-community.i18n/**/*"/>
</zip>
</target>

<target name="deploy" depends="package"
description="Deploy the plugin to a local OT instance">
<copy todir="${dita-ot-dir}/plugins">
<fileset dir="${package.dir}/plugins">
<include name="**/*"/>
</fileset>
</copy>
</target>

</project>
3 changes: 3 additions & 0 deletions new-build.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
path.variable.kotlin_bundled=/Applications/IntelliJ IDEA CE.app/Contents/plugins/Kotlin/kotlinc
path.variable.maven_repository=/Users/ekimber/.m2/repository
jdk.home.1.7=/Library/Java/JavaVirtualMachines/jdk1.7.0_79.jdk/Contents/Home
23 changes: 23 additions & 0 deletions org.dita-community.i18n.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="lib" level="project" />
<orderEntry type="module-library" scope="TEST">
<library name="JUnit4">
<CLASSES>
<root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.12.jar!/" />
<root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>
9 changes: 9 additions & 0 deletions plugin/build.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project basedir="." name="org.dita-community.i18n">

<target name="org.dita-community.i18n-test">
<echo>Testing I18N features:</echo>
<echo>Test TBD but will exercise the XSLT integration and demonstrate
sorting of Simplified Chinese and other languages. </echo>
</target>
</project>
37 changes: 37 additions & 0 deletions plugin/conf/grouping-and-sorting/ar/ar-sort-rules.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[reorder Latn Arab]
Loading

0 comments on commit dbf06eb

Please sign in to comment.