Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge

  • Loading branch information...
commit fe9150489d8f84046e3411be1a6ef6795798885d 1 parent e635696
@jimmyshiau jimmyshiau authored
View
6 .classpath
@@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
+ <classpathentry excluding="archive/" kind="src" path="breeze/src"/>
+ <classpathentry kind="src" path="breeze/src/archive"/>
+ <classpathentry kind="src" path="zkthemedemo/src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
View
6 .project
@@ -11,6 +11,11 @@
</arguments>
</buildCommand>
<buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
<name>org.maven.ide.eclipse.maven2Builder</name>
<arguments>
</arguments>
@@ -18,6 +23,7 @@
</buildSpec>
<natures>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
View
8 .settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Tue Jan 25 00:34:30 CST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.4
View
4 .settings/org.eclipse.wst.common.project.facet.core.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <installed facet="java" version="1.4"/>
+</faceted-project>
View
2  .settings/org.maven.ide.eclipse.prefs
@@ -1,4 +1,4 @@
-#Thu Apr 07 08:50:03 CST 2011
+#Tue Jan 25 00:09:51 CST 2011
activeProfiles=
eclipse.preferences.version=1
fullBuildGoals=process-test-resources
View
28 breeze/src/archive/metainfo/zk/config.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<config>
- <config-name>breeze</config-name><!-- used to resolve dependency -->
- <depends>zul</depends>
- <version>
- <version-class>org.zkoss.theme.breeze.Version</version-class>
- <version-uid>5.0.7</version-uid>
- </version>
-
- <listener>
- <listener-class>org.zkoss.theme.breeze.BreezeThemeWebAppInit</listener-class>
- </listener>
-</config>
+<?xml version="1.0" encoding="UTF-8"?>
+
+<config>
+ <config-name>breeze</config-name><!-- used to resolve dependency -->
+ <depends>zul</depends>
+ <version>
+ <version-class>org.zkoss.theme.breeze.Version</version-class>
+ <version-uid>5.0.7</version-uid>
+ </version>
+
+ <listener>
+ <listener-class>org.zkoss.theme.breeze.BreezeThemeWebAppInit</listener-class>
+ </listener>
+</config>
View
32 breeze/src/archive/metainfo/zk/lang-addon.xml
@@ -1,16 +1,16 @@
-<language-addon>
- <addon-name>breeze</addon-name>
- <depends>zul</depends>
- <language-name>xul/html</language-name>
-
- <version>
- <version-class>org.zkoss.theme.breeze.Version</version-class>
- <version-uid>5.0.7</version-uid>
- </version>
-
- <!-- backward compatible -->
- <library-property>
- <name>org.zkoss.zul.themejar.breeze</name>
- <value>true</value>
- </library-property>
-</language-addon>
+<language-addon>
+ <addon-name>breeze</addon-name>
+ <depends>zul</depends>
+ <language-name>xul/html</language-name>
+
+ <version>
+ <version-class>org.zkoss.theme.breeze.Version</version-class>
+ <version-uid>5.0.7</version-uid>
+ </version>
+
+ <!-- backward compatible -->
+ <library-property>
+ <name>org.zkoss.zul.themejar.breeze</name>
+ <value>true</value>
+ </library-property>
+</language-addon>
View
1  breeze/version
@@ -0,0 +1 @@
+5.0.7
View
3  build.projects
@@ -0,0 +1,3 @@
+breeze
+sapphire
+silvertail
View
19 bundle.xml
@@ -0,0 +1,19 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+ <id>bundle</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <files>
+ <file>
+ <source>pom.xml</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ <file>
+ <source>${project.build.directory}/${artifactId}-${version}.jar</source>
+ <outputDirectory>/</outputDirectory>
+ </file>
+ </files>
+</assembly>
View
48 pom.xml
@@ -8,10 +8,9 @@
<name>ZK Theme Maven Bulider</name>
<url>http://www.zkoss.org/themes</url>
<modules>
- <module>breeze</module>
- <module>sapphire</module>
+ <module>breeze</module>
+ <module>sapphire</module>
<module>silvertail</module>
- <module>zkthemedemo</module>
</modules>
<licenses>
<license>
@@ -47,4 +46,47 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <inherited>false</inherited>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <delete
+ file="${project.build.directory}\${project.artifactId}-${project.version}.jar" />
+ <jar
+ destfile="${project.build.directory}\${project.artifactId}-${project.version}.jar" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <inherited>false</inherited>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>bundle.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
View
22 readme.txt
@@ -0,0 +1,22 @@
+*** How to build the project ***
+
+run the following maven command
+
+:) mvn clean package
+
+and then the distribution files are put into the "dist" directory(including the Maven's bundle jar for Maven repository)
+
+
+*** How to create a new theme ***
+
+Please follow the breeze's structure.
+For example,
+
+breeze/
+ /pom.xml (Maven project setting)
+ /src/ (the ZK default structure, or you can also use the Maven default structure, like main/java main/resource)
+ /archive
+ /org
+ /assembly (the build setting, you have to copy it as well)
+
+
View
87 release
@@ -0,0 +1,87 @@
+#!/bin/bash
+#
+#{{IS_NOTE
+# Purpose:
+# To build java projects
+# Description:
+# 'build help' for more descriptions
+# History:
+# Apring 6 18:10 2011, Created by jimmyshiau
+#}}IS_NOTE
+#
+#Copyright (C) 2011 Potix Corporation. All Rights Reserved.
+#
+#{{IS_RIGHT
+# This program is distributed under GPL Version 3.0 in the hope that
+# it will be useful, but WITHOUT ANY WARRANTY.
+#}}IS_RIGHT
+#
+
+cmd=$1
+maindir="$(pwd)"
+stamp=$(date +%Y%m%d)
+parentVer=$(head -1 version)
+
+#-- Prepare $targetList
+#Add a project to the target list (the redudant ones won't be added)
+if [ ! -f build.projects ] ; then
+ echo build.projects not found
+ exit 1
+fi
+targetListOld="$(cat build.projects | tr '\n' ' ')"
+targetListOld="${targetListOld% }"
+targetList=
+for target in $targetListOld ; do
+ ver=$(head -1 $target/version)
+ if [ $parentVer == $ver ] ; then
+ targetList="$targetList $target"
+ fi
+done
+
+function updateVersion
+{
+ if [ "$1" != "" ] ; then
+ ver=$(head -1 $1/version)
+ if [ "$cmd" == "official" ] ; then
+ verFL=$ver
+ else
+ verFL=$ver.FL.$stamp
+ fi
+ sed -i "1,/description/s/version>.*<\/version/version>$verFL<\/version/" $maindir/$1/pom.xml
+ else
+ ver=$(head -1 version)
+ if [ "$cmd" == "official" ] ; then
+ verFL=$parentVer
+ else
+ verFL=$parentVer.FL.$stamp
+ fi
+ sed -i "1,/version>.*<\/version/s/version>.*<\/version/version>$verFL<\/version/" pom.xml
+ fi
+}
+
+updateVersion ""
+echo "targets: ${targetList}"
+for target in $targetList ; do
+ if [ -d $target ] ; then
+ updateVersion $target
+ else
+ echo "Ignore: $target doesn't exist"
+ fi
+done
+mvn clean package
+mkdir -p dist/maven
+rm -f dist/maven/zktheme*.jar
+mv -f target/*-bundle.jar dist/maven
+for target in $targetList ; do
+ if [ -d $target ] ; then
+ rm -f dist/maven/$target*.jar
+ rm -f dist/$target*.jar
+ rm -f dist/$target*.zip
+ mv -f $target/target/*-bundle.jar dist/maven
+ mv -f $target/target/*.jar dist
+ mv -f $target/target/*.zip dist
+ else
+ echo "Ignore: $target doesn't exist"
+ fi
+done
+
View
1  sapphire/version
@@ -0,0 +1 @@
+5.0.7
View
1  silvertail/version
@@ -0,0 +1 @@
+5.0.7
View
66 upVer
@@ -0,0 +1,66 @@
+#!/bin/bash
+# release
+#
+#{{IS_NOTE
+# Purpose:
+#
+# Description:
+#
+# History:
+# Tue Mar 3 11:11:09 2011, Created by Jimmy
+#}}IS_NOTE
+#
+#Copyright (C) 2011 Potix Corporation. All Rights Reserved.
+#
+#{{IS_RIGHT
+#}}IS_RIGHT
+#
+maindir="$(pwd)"
+maindir="${maindir%/cmldoc}"
+cd $maindir
+echo "Working directory $maindir"
+stamp=$(date +%Y%m%d)
+target=$1
+oldVersion=$2
+newVersion=$3
+
+if [ "$newVersion" == "" ] ; then
+ target=""
+ oldVersion=$1
+ newVersion=$2
+fi
+
+if [ "$oldVersion" == "" ] || [ "$newVersion" == "" ] ; then
+ echo "Usage: upVer [ breeze | etc..] [ oldVersion ] [ newVersion ]"
+ exit 1
+fi
+
+function upVer {
+ sed -i "s/$oldVersion/$newVersion/g" $maindir/$1/version
+ sed -i "1,/description/s/version>.*<\/version/version>$newVersion<\/version/" $maindir/$1/pom.xml
+ find $maindir/$1/src -name config.xml -exec sed -i "s/version-uid>.*<\/version-uid/version-uid>$newVersion<\/version-uid/" {} \;
+ find $maindir/$1/src -name lang-addon.xml -exec sed -i "s/version-uid>.*<\/version-uid/version-uid>$newVersion<\/version-uid/" {} \;
+ find $maindir/$1/src -name Version.java -exec sed -i "s/UID.*;/UID = \"$ver\";/g" {} \;
+ echo "Update $1 version to $newVersion"
+}
+
+sed -i "s/$oldVersion/$newVersion/g" version
+sed -i "1,/version>.*<\/version/s/version>.*<\/version/version>$newVersion<\/version/" pom.xml
+if [ "$target" != "" ] ; then
+ upVer $target
+else
+ targetListOld="$(cat build.projects | tr '\n' ' ')"
+ targetListOld="${targetListOld% }"
+ targetList=
+ for target in $targetListOld ; do
+ targetList="$targetList $target"
+ done
+ echo "targets: ${targetList}"
+ for target in $targetList ; do
+ if [ -d $target ] ; then
+ upVer $target
+ else
+ echo "Ignore: $target doesn't exist"
+ fi
+ done
+fi
View
1  version
@@ -0,0 +1 @@
+5.0.7
Please sign in to comment.
Something went wrong with that request. Please try again.