git status
git commit -am "User Guide ¸ñ·Ï ¹ø¿ª"
ant build-docs
mv output/build/webapps/docs /tmp
git checkout gh-pages
rm -rf docs; mv /tmp/docs .
git add .
git status
git commit -am "User Guide ¸ñ·Ï ¹ø¿ª"
git push origin trunk gh-pages
trunk ºê·£Ä¡¿Í gh-pages ºê·£Ä¡¸¦ origin ¿ø°Ý¿¡ ÇѲ¨¹ø¿¡ º¸³À´Ï´Ù(push).
----
# On branch trunk
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: webapps/docs/index.xml
#
no changes added to commit (use "git add" and/or "git commit -a")
GWANG-NAM-HEOs-iMac:tomcat70 kenu$ git commit -am "User Guide ¸ñ·Ï ¹ø¿ª"
[trunk 95642c1] User Guide ¸ñ·Ï ¹ø¿ª
1 files changed, 37 insertions(+), 38 deletions(-)
GWANG-NAM-HEOs-iMac:tomcat70 kenu$ ant build-docs
Buildfile: /Users/kenu/git/tomcat70/build.xml
compile-prepare:
build-docs:
[copy] Copying 26 files to /Users/kenu/git/tomcat70/output/build/webapps
[copy] Copying 4 files to /Users/kenu/git/tomcat70/output/build/webapps
[copy] Copying 2 files to /Users/kenu/git/tomcat70/output/build/webapps/docs
[copy] Copying 1 file to /Users/kenu/git/tomcat70/output/build/webapps/docs
[copy] Copying 1 file to /Users/kenu/git/tomcat70/output/build/webapps/docs/appdev/sample
[mkdir] Created dir: /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs
[xslt] Transforming into /Users/kenu/git/tomcat70/output/build/webapps/docs
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/aio.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/aio.html
[xslt] Loading stylesheet /Users/kenu/git/tomcat70/webapps/docs/tomcat-docs.xsl
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/apr.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/apr.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/balancer-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/balancer-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/building.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/building.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/cgi-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/cgi-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/changelog.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/changelog.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/class-loader-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/class-loader-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/cluster-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/cluster-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/connectors.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/connectors.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/default-servlet.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/default-servlet.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/deployer-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/deployer-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/developers.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/developers.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/extras.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/extras.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/html-manager-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/html-manager-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/index.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/index.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/introduction.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/introduction.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/jasper-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/jasper-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/jdbc-pool.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/jdbc-pool.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/jndi-datasource-examples-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/jndi-datasource-examples-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/jndi-resources-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/jndi-resources-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/logging.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/logging.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/manager-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/manager-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/maven-jars.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/maven-jars.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/mbeans-descriptor-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/mbeans-descriptor-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/monitoring.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/monitoring.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/proxy-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/proxy-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/realm-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/realm-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/security-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/security-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/security-manager-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/security-manager-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/setup.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/setup.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/ssi-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/ssi-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/ssl-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/ssl-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/virtual-hosting-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/virtual-hosting-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/web-socket-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/web-socket-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/windows-auth-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/windows-auth-howto.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/windows-service-howto.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/windows-service-howto.html
[xslt] Transforming into /Users/kenu/git/tomcat70/output/build/webapps/docs/appdev
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/appdev/deployment.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/appdev/deployment.html
[xslt] Loading stylesheet /Users/kenu/git/tomcat70/webapps/docs/tomcat-docs.xsl
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/appdev/index.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/appdev/index.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/appdev/installation.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/appdev/installation.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/appdev/introduction.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/appdev/introduction.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/appdev/processes.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/appdev/processes.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/appdev/source.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/appdev/source.html
[xslt] Transforming into /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/funcspecs/fs-admin-apps.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs/fs-admin-apps.html
[xslt] Loading stylesheet /Users/kenu/git/tomcat70/webapps/docs/tomcat-docs.xsl
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/funcspecs/fs-admin-objects.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs/fs-admin-objects.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/funcspecs/fs-admin-opers.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs/fs-admin-opers.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/funcspecs/fs-default.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs/fs-default.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/funcspecs/fs-jdbc-realm.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs/fs-jdbc-realm.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/funcspecs/fs-jndi-realm.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs/fs-jndi-realm.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/funcspecs/fs-memory-realm.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs/fs-memory-realm.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/funcspecs/index.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs/index.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/funcspecs/mbean-names.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/funcspecs/mbean-names.html
[xslt] Transforming into /Users/kenu/git/tomcat70/output/build/webapps/docs/config
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/ajp.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/ajp.html
[xslt] Loading stylesheet /Users/kenu/git/tomcat70/webapps/docs/tomcat-docs.xsl
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster-channel.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster-channel.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster-deployer.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster-deployer.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster-interceptor.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster-interceptor.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster-listener.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster-listener.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster-manager.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster-manager.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster-membership.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster-membership.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster-receiver.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster-receiver.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster-sender.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster-sender.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster-valve.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster-valve.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/cluster.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/cluster.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/context.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/context.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/engine.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/engine.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/executor.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/executor.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/filter.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/filter.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/globalresources.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/globalresources.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/host.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/host.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/http.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/http.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/index.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/index.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/jar-scanner.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/jar-scanner.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/listeners.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/listeners.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/loader.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/loader.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/manager.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/manager.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/realm.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/realm.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/resources.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/resources.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/server.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/server.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/service.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/service.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/systemprops.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/systemprops.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/config/valve.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/config/valve.html
[xslt] Transforming into /Users/kenu/git/tomcat70/output/build/webapps/docs/architecture
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/architecture/index.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/architecture/index.html
[xslt] Loading stylesheet /Users/kenu/git/tomcat70/webapps/docs/tomcat-docs.xsl
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/architecture/overview.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/architecture/overview.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/architecture/requestProcess.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/architecture/requestProcess.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/architecture/startup.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/architecture/startup.html
[xslt] Transforming into /Users/kenu/git/tomcat70/output/build/webapps/docs/tribes
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/tribes/developers.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/tribes/developers.html
[xslt] Loading stylesheet /Users/kenu/git/tomcat70/webapps/docs/tomcat-docs.xsl
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/tribes/faq.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/tribes/faq.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/tribes/interceptors.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/tribes/interceptors.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/tribes/introduction.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/tribes/introduction.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/tribes/membership.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/tribes/membership.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/tribes/setup.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/tribes/setup.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/tribes/status.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/tribes/status.html
[xslt] Processing /Users/kenu/git/tomcat70/webapps/docs/tribes/transport.xml to /Users/kenu/git/tomcat70/output/build/webapps/docs/tribes/transport.html
BUILD SUCCESSFUL
Total time: 6 seconds
GWANG-NAM-HEOs-iMac:tomcat70 kenu$
GWANG-NAM-HEOs-iMac:tomcat70 kenu$ mv output/build/webapps/docs /tmp
GWANG-NAM-HEOs-iMac:tomcat70 kenu$ git checkout gh-pages
Switched to branch 'gh-pages'
GWANG-NAM-HEOs-iMac:tomcat70 kenu$ rm -rf docs; mv /tmp/docs .
GWANG-NAM-HEOs-iMac:tomcat70 kenu$ git add .
GWANG-NAM-HEOs-iMac:tomcat70 kenu$ git status
# On branch gh-pages
# Changes to be committed:
# (use "git reset HEAD <file>..." to unstage)
#
# modified: docs/index.html
#
GWANG-NAM-HEOs-iMac:tomcat70 kenu$ git commit -am "User Guide ¸ñ·Ï ¹ø¿ª"
[gh-pages e3f938d] User Guide ¸ñ·Ï ¹ø¿ª
1 files changed, 37 insertions(+), 38 deletions(-)
GWANG-NAM-HEOs-iMac:tomcat70 kenu$ git push origin trunk gh-pages
Username:
Password:
Counting objects: 16, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 2.49 KiB, done.
Total 9 (delta 7), reused 0 (delta 0)
To https://github.com/kenu/tomcat70.git
71fddfd..e3f938d gh-pages -> gh-pages
09e0e4a..95642c1 trunk -> trunk