Menu
▾
▴
aplaws-commit — Automatic mailing when changes are committed to CVS.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(48) |
Dec
(31) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(22) |
Feb
(68) |
Mar
(185) |
Apr
(11) |
May
(21) |
Jun
(23) |
Jul
(46) |
Aug
(69) |
Sep
(211) |
Oct
(26) |
Nov
(51) |
Dec
(52) |
| 2006 |
Jan
(13) |
Feb
(13) |
Mar
(8) |
Apr
(21) |
May
(17) |
Jun
(100) |
Jul
(34) |
Aug
(23) |
Sep
(26) |
Oct
(16) |
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(66) |
Oct
(10) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(3) |
May
(8) |
Jun
(5) |
Jul
(31) |
Aug
(8) |
Sep
(11) |
Oct
(6) |
Nov
|
Dec
|
| 2012 |
Jan
(13) |
Feb
(2) |
Mar
(9) |
Apr
(6) |
May
(24) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(120) |
| 2013 |
Jan
(6) |
Feb
(35) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <ssk...@vh...> - 2005-09-30 10:56:56
|
Author: sskracic Date: 2005-09-30 12:47:01 +0200 (Fri, 30 Sep 2005) New Revision: 941 Modified: releases/1.0.3/ccm-core/application.xml releases/1.0.3/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql Log: Integrated r940 onto 1.0.3 release branch (incorrect path to the upgrade script). Modified: releases/1.0.3/ccm-core/application.xml =================================================================== --- releases/1.0.3/ccm-core/application.xml 2005-09-30 10:43:54 UTC (rev 940) +++ releases/1.0.3/ccm-core/application.xml 2005-09-30 10:47:01 UTC (rev 941) @@ -3,7 +3,7 @@ name="ccm-core" prettyName="Core" version="6.2.0" - release="1" + release="2" webapp="ROOT" buildHooks="build-hooks.xml"> <ccm:dependencies> Modified: releases/1.0.3/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql =================================================================== --- releases/1.0.3/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql 2005-09-30 10:43:54 UTC (rev 940) +++ releases/1.0.3/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql 2005-09-30 10:47:01 UTC (rev 941) @@ -17,5 +17,5 @@ begin; \i ../postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql - \i ../postgres/upgrade/add_column_ignore_parent_index.sql + \i ../postgres/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql commit; |
|
From: <ssk...@vh...> - 2005-09-30 10:53:58
|
Author: sskracic Date: 2005-09-30 12:43:54 +0200 (Fri, 30 Sep 2005) New Revision: 940 Modified: trunk/ccm-core/application.xml trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql Log: Incorrect path given to the upgrade script. Modified: trunk/ccm-core/application.xml =================================================================== --- trunk/ccm-core/application.xml 2005-09-30 10:25:50 UTC (rev 939) +++ trunk/ccm-core/application.xml 2005-09-30 10:43:54 UTC (rev 940) @@ -3,7 +3,7 @@ name="ccm-core" prettyName="Core" version="6.3.0" - release="1" + release="2" webapp="ROOT" buildHooks="build-hooks.xml"> <ccm:dependencies> Modified: trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql =================================================================== --- trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql 2005-09-30 10:25:50 UTC (rev 939) +++ trunk/ccm-core/sql/ccm-core/upgrade/postgres-6.1.1-6.1.2.sql 2005-09-30 10:43:54 UTC (rev 940) @@ -17,5 +17,5 @@ begin; \i ../postgres/upgrade/6.1.1-6.1.2/trigger-sync_lucene_docs.sql - \i ../postgres/upgrade/add_column_ignore_parent_index.sql + \i ../postgres/upgrade/6.1.1-6.1.2/add_column_ignore_parent_index.sql commit; |
|
From: <ssk...@vh...> - 2005-09-30 10:35:44
|
Author: sskracic
Date: 2005-09-30 12:25:50 +0200 (Fri, 30 Sep 2005)
New Revision: 939
Modified:
users/sskracic/bin/pgcompare.tcl
Log:
The postgres database name may contain dash (-).
Not only that, but the regexp that matches command line options
was wrong.
Modified: users/sskracic/bin/pgcompare.tcl
===================================================================
--- users/sskracic/bin/pgcompare.tcl 2005-09-29 20:46:18 UTC (rev 938)
+++ users/sskracic/bin/pgcompare.tcl 2005-09-30 10:25:50 UTC (rev 939)
@@ -50,7 +50,7 @@
set options [list]
for {set optionc 0} {$optionc < [llength $argv]} {incr optionc} {
set arg [lindex $argv $optionc]
- if {[regexp -- {-(.*)} $arg all opt]} {
+ if {[regexp -- {^-(.*)} $arg all opt]} {
switch -exact -- $opt {
"-" { break }
"t" { set filter [lindex $argv [incr optionc]] ; lappend options $opt }
|
|
From: <ssk...@vh...> - 2005-09-29 20:56:03
|
Author: sskracic
Date: 2005-09-29 22:46:18 +0200 (Thu, 29 Sep 2005)
New Revision: 938
Modified:
releases/1.0.3/tools/tools/configure.in
releases/1.0.3/tools/tools/server/tomcat/conf/server-devel.xml.in
Log:
Integrating r937 to release 1.0.3 branch (completed removal of ajp-port
for development Tomcat configuration template).
Modified: releases/1.0.3/tools/tools/configure.in
===================================================================
--- releases/1.0.3/tools/tools/configure.in 2005-09-29 20:43:31 UTC (rev 937)
+++ releases/1.0.3/tools/tools/configure.in 2005-09-29 20:46:18 UTC (rev 938)
@@ -4,7 +4,7 @@
AC_INIT(ccm-tools.spec.in)
VERSION=6.2.0
-RELEASE=1
+RELEASE=2
AM_INIT_AUTOMAKE(ccm-tools, $VERSION)
AC_SUBST(RELEASE)
Modified: releases/1.0.3/tools/tools/server/tomcat/conf/server-devel.xml.in
===================================================================
--- releases/1.0.3/tools/tools/server/tomcat/conf/server-devel.xml.in 2005-09-29 20:43:31 UTC (rev 937)
+++ releases/1.0.3/tools/tools/server/tomcat/conf/server-devel.xml.in 2005-09-29 20:46:18 UTC (rev 938)
@@ -1,7 +1,6 @@
<Server port="::shutdown-port::" shutdown="SHUTDOWN" debug="9">
<!--
- http-port => ::http-port::
- - ajp-port => ::ajp-port::
- shutdown-port => ::shutdown-port::
-->
<Service name="Tomcat-Standalone">
|
|
From: <ssk...@vh...> - 2005-09-29 20:53:18
|
Author: sskracic
Date: 2005-09-29 22:43:31 +0200 (Thu, 29 Sep 2005)
New Revision: 937
Modified:
trunk/tools/tools/configure.in
trunk/tools/tools/server/tomcat/conf/server-devel.xml.in
Log:
Finished removal of ajp-port from tomcat devel template.
Modified: trunk/tools/tools/configure.in
===================================================================
--- trunk/tools/tools/configure.in 2005-09-29 19:49:32 UTC (rev 936)
+++ trunk/tools/tools/configure.in 2005-09-29 20:43:31 UTC (rev 937)
@@ -4,7 +4,7 @@
AC_INIT(ccm-tools.spec.in)
VERSION=6.3.0
-RELEASE=1
+RELEASE=2
AM_INIT_AUTOMAKE(ccm-tools, $VERSION)
AC_SUBST(RELEASE)
Modified: trunk/tools/tools/server/tomcat/conf/server-devel.xml.in
===================================================================
--- trunk/tools/tools/server/tomcat/conf/server-devel.xml.in 2005-09-29 19:49:32 UTC (rev 936)
+++ trunk/tools/tools/server/tomcat/conf/server-devel.xml.in 2005-09-29 20:43:31 UTC (rev 937)
@@ -1,7 +1,6 @@
<Server port="::shutdown-port::" shutdown="SHUTDOWN" debug="9">
<!--
- http-port => ::http-port::
- - ajp-port => ::ajp-port::
- shutdown-port => ::shutdown-port::
-->
<Service name="Tomcat-Standalone">
|
|
From: <ssk...@vh...> - 2005-09-29 19:59:19
|
Author: sskracic Date: 2005-09-29 21:49:32 +0200 (Thu, 29 Sep 2005) New Revision: 936 Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/complete/ releases/1.0.3/ccm-ldn-aplaws/bundles/complete/cfg/ releases/1.0.3/ccm-ldn-aplaws/bundles/devel/ releases/1.0.3/ccm-ldn-aplaws/bundles/devel/cfg/ releases/1.0.3/ccm-ldn-aplaws/bundles/standard/ releases/1.0.3/ccm-ldn-aplaws/bundles/standard/cfg/ Log: Ajusting svn:ignore Property changes on: releases/1.0.3/ccm-ldn-aplaws/bundles/complete ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh configure.in Makefile.am ccm-bundle-aplaws-plus-*.spec.in Property changes on: releases/1.0.3/ccm-ldn-aplaws/bundles/complete/cfg ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile Makefile.am Property changes on: releases/1.0.3/ccm-ldn-aplaws/bundles/devel ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh configure.in Makefile.am ccm-bundle-aplaws-plus-*.spec.in Property changes on: releases/1.0.3/ccm-ldn-aplaws/bundles/devel/cfg ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile Makefile.am Property changes on: releases/1.0.3/ccm-ldn-aplaws/bundles/standard ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh configure.in Makefile.am ccm-bundle-aplaws-plus-*.spec.in Property changes on: releases/1.0.3/ccm-ldn-aplaws/bundles/standard/cfg ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile Makefile.am |
|
From: <ssk...@vh...> - 2005-09-29 19:58:53
|
Author: sskracic Date: 2005-09-29 21:49:09 +0200 (Thu, 29 Sep 2005) New Revision: 935 Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/demo/ releases/1.0.3/ccm-ldn-aplaws/bundles/demo/cfg/ Log: Adjusting svn:ignore Property changes on: releases/1.0.3/ccm-ldn-aplaws/bundles/demo ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh configure.in Makefile.am ccm-bundle-aplaws-plus-*.spec.in Property changes on: releases/1.0.3/ccm-ldn-aplaws/bundles/demo/cfg ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile Makefile.am |
|
From: <ssk...@vh...> - 2005-09-29 19:43:29
|
Author: sskracic
Date: 2005-09-29 21:33:33 +0200 (Thu, 29 Sep 2005)
New Revision: 934
Modified:
releases/1.0.3/tools/devel/configure.in
releases/1.0.3/tools/tools/server/tomcat/conf/server-default.xml.in
releases/1.0.3/tools/tools/server/tomcat/conf/server-devel.xml.in
Log:
Integrated r933 onto release branch (turned off DNS lookups
for production template, and removed ajp connector from devel
template).
Modified: releases/1.0.3/tools/devel/configure.in
===================================================================
--- releases/1.0.3/tools/devel/configure.in 2005-09-29 19:31:40 UTC (rev 933)
+++ releases/1.0.3/tools/devel/configure.in 2005-09-29 19:33:33 UTC (rev 934)
@@ -4,7 +4,7 @@
AC_INIT(ccm-devel.spec.in)
VERSION=6.2.0
-RELEASE=1
+RELEASE=2
AM_INIT_AUTOMAKE(ccm-devel, $VERSION)
AC_SUBST(RELEASE)
Modified: releases/1.0.3/tools/tools/server/tomcat/conf/server-default.xml.in
===================================================================
--- releases/1.0.3/tools/tools/server/tomcat/conf/server-default.xml.in 2005-09-29 19:31:40 UTC (rev 933)
+++ releases/1.0.3/tools/tools/server/tomcat/conf/server-default.xml.in 2005-09-29 19:33:33 UTC (rev 934)
@@ -8,12 +8,12 @@
<Connector className="org.apache.catalina.connector.http.HttpConnector"
port="::http-port::" minProcessors="10" maxProcessors="20"
- enableLookups="true" redirectPort="8443"
+ enableLookups="false" redirectPort="8443"
acceptCount="10" debug="0" connectionTimeout="60000"/>
<Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
port="::ajp-port::" minProcessors="5" maxProcessors="75"
- enableLookups="true" redirectPort="8443"
+ enableLookups="false" redirectPort="8443"
acceptCount="10" debug="0" connectionTimeout="0"
useURIValidationHack="false"
protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
Modified: releases/1.0.3/tools/tools/server/tomcat/conf/server-devel.xml.in
===================================================================
--- releases/1.0.3/tools/tools/server/tomcat/conf/server-devel.xml.in 2005-09-29 19:31:40 UTC (rev 933)
+++ releases/1.0.3/tools/tools/server/tomcat/conf/server-devel.xml.in 2005-09-29 19:33:33 UTC (rev 934)
@@ -11,13 +11,6 @@
enableLookups="true" redirectPort="8443"
acceptCount="10" debug="9" connectionTimeout="60000"/>
- <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
- port="::ajp-port::" minProcessors="5" maxProcessors="75"
- enableLookups="true" redirectPort="8443"
- acceptCount="10" debug="9" connectionTimeout="0"
- useURIValidationHack="false"
- protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
-
<Engine name="Standalone::http-port::" defaultHost="localhost" debug="9">
<Logger className="org.apache.catalina.logger.FileLogger"
prefix="catalina." suffix=".log" directory="::log-dir::"
|
|
From: <ssk...@vh...> - 2005-09-29 19:41:42
|
Author: sskracic
Date: 2005-09-29 21:31:40 +0200 (Thu, 29 Sep 2005)
New Revision: 933
Modified:
trunk/tools/devel/configure.in
trunk/tools/tools/server/tomcat/conf/server-default.xml.in
trunk/tools/tools/server/tomcat/conf/server-devel.xml.in
Log:
* Removed ajp-port from devel template. If you're developing, you can
always add it manually, but the majority of time you'll be connecting
straight to HTTP.
* Turned off reverse DNS lookups in production server.xml template.
Modified: trunk/tools/devel/configure.in
===================================================================
--- trunk/tools/devel/configure.in 2005-09-29 19:19:54 UTC (rev 932)
+++ trunk/tools/devel/configure.in 2005-09-29 19:31:40 UTC (rev 933)
@@ -4,7 +4,7 @@
AC_INIT(ccm-devel.spec.in)
VERSION=6.3.0
-RELEASE=1
+RELEASE=2
AM_INIT_AUTOMAKE(ccm-devel, $VERSION)
AC_SUBST(RELEASE)
Modified: trunk/tools/tools/server/tomcat/conf/server-default.xml.in
===================================================================
--- trunk/tools/tools/server/tomcat/conf/server-default.xml.in 2005-09-29 19:19:54 UTC (rev 932)
+++ trunk/tools/tools/server/tomcat/conf/server-default.xml.in 2005-09-29 19:31:40 UTC (rev 933)
@@ -8,12 +8,12 @@
<Connector className="org.apache.catalina.connector.http.HttpConnector"
port="::http-port::" minProcessors="10" maxProcessors="20"
- enableLookups="true" redirectPort="8443"
+ enableLookups="false" redirectPort="8443"
acceptCount="10" debug="0" connectionTimeout="60000"/>
<Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
port="::ajp-port::" minProcessors="5" maxProcessors="75"
- enableLookups="true" redirectPort="8443"
+ enableLookups="false" redirectPort="8443"
acceptCount="10" debug="0" connectionTimeout="0"
useURIValidationHack="false"
protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
Modified: trunk/tools/tools/server/tomcat/conf/server-devel.xml.in
===================================================================
--- trunk/tools/tools/server/tomcat/conf/server-devel.xml.in 2005-09-29 19:19:54 UTC (rev 932)
+++ trunk/tools/tools/server/tomcat/conf/server-devel.xml.in 2005-09-29 19:31:40 UTC (rev 933)
@@ -11,13 +11,6 @@
enableLookups="true" redirectPort="8443"
acceptCount="10" debug="9" connectionTimeout="60000"/>
- <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
- port="::ajp-port::" minProcessors="5" maxProcessors="75"
- enableLookups="true" redirectPort="8443"
- acceptCount="10" debug="9" connectionTimeout="0"
- useURIValidationHack="false"
- protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
-
<Engine name="Standalone::http-port::" defaultHost="localhost" debug="9">
<Logger className="org.apache.catalina.logger.FileLogger"
prefix="catalina." suffix=".log" directory="::log-dir::"
|
|
From: <ssk...@vh...> - 2005-09-29 19:29:45
|
Author: sskracic
Date: 2005-09-29 21:19:54 +0200 (Thu, 29 Sep 2005)
New Revision: 932
Modified:
releases/1.0.3/ccm-formbuilder-pdf/application.xml
releases/1.0.3/ccm-forum/application.xml
Log:
Bumping the release number due to the previous commit.
Modified: releases/1.0.3/ccm-formbuilder-pdf/application.xml
===================================================================
--- releases/1.0.3/ccm-formbuilder-pdf/application.xml 2005-09-29 19:14:46 UTC (rev 931)
+++ releases/1.0.3/ccm-formbuilder-pdf/application.xml 2005-09-29 19:19:54 UTC (rev 932)
@@ -3,7 +3,7 @@
name="ccm-formbuilder-pdf"
prettyName="PDFConverter"
version="6.2.0"
- release="1">
+ release="2">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.2.0"/>
Modified: releases/1.0.3/ccm-forum/application.xml
===================================================================
--- releases/1.0.3/ccm-forum/application.xml 2005-09-29 19:14:46 UTC (rev 931)
+++ releases/1.0.3/ccm-forum/application.xml 2005-09-29 19:19:54 UTC (rev 932)
@@ -3,7 +3,7 @@
name="ccm-forum"
prettyName="Forum"
version="6.2.0"
- release="1">
+ release="2">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.2.0" relation="ge"/>
<ccm:requires name="ccm-cms" version="6.2.0" relation="ge"/>
|
|
From: <ssk...@vh...> - 2005-09-29 19:24:40
|
Author: sskracic Date: 2005-09-29 21:14:46 +0200 (Thu, 29 Sep 2005) New Revision: 931 Added: releases/1.0.3/ccm-formbuilder-pdf/web/WEB-INF/bebop-define.tld releases/1.0.3/ccm-formbuilder-pdf/web/WEB-INF/bebop-show.tld releases/1.0.3/ccm-forum/web/WEB-INF/bebop-define.tld releases/1.0.3/ccm-forum/web/WEB-INF/bebop-show.tld Log: Integrated r930 to 1.0.3 release (added missing files, referenced by various web.xml's). Copied: releases/1.0.3/ccm-formbuilder-pdf/web/WEB-INF/bebop-define.tld (from rev 930, trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-define.tld) Copied: releases/1.0.3/ccm-formbuilder-pdf/web/WEB-INF/bebop-show.tld (from rev 930, trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-show.tld) Copied: releases/1.0.3/ccm-forum/web/WEB-INF/bebop-define.tld (from rev 930, trunk/ccm-forum/web/WEB-INF/bebop-define.tld) Copied: releases/1.0.3/ccm-forum/web/WEB-INF/bebop-show.tld (from rev 930, trunk/ccm-forum/web/WEB-INF/bebop-show.tld) |
|
From: <ssk...@vh...> - 2005-09-29 19:17:28
|
Author: sskracic Date: 2005-09-29 21:07:41 +0200 (Thu, 29 Sep 2005) New Revision: 930 Added: trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-define.tld trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-show.tld trunk/ccm-forum/web/WEB-INF/bebop-define.tld trunk/ccm-forum/web/WEB-INF/bebop-show.tld Log: Yeah, referenced files should better be there! :) Added: trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-define.tld =================================================================== --- trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-define.tld 2005-09-29 18:13:24 UTC (rev 929) +++ trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-define.tld 2005-09-29 19:07:41 UTC (rev 930) @@ -0,0 +1,395 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> + +<taglib> + <tlibversion>1.0</tlibversion> + <jspversion>1.1</jspversion> + <shortname>bebop-define</shortname> + <uri>http://www.arsdigita.com/bebop-define/tld/1.0</uri> + + <info>this is a tag library for defining Bebop pages via JSP.</info> + + <tag> + <name>page</name> + <tagclass>com.arsdigita.bebop.jsp.DefinePage</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefinePageExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>title</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>application</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>master</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>pageClass</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>cache</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>component</name> + <tagclass>com.arsdigita.bebop.jsp.DefineComponentImpl</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineComponentExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>classname</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>form</name> + <tagclass>com.arsdigita.bebop.jsp.DefineForm</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineFormExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>encType</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>method</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>action</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>onSubmit</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>onReset</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>link</name> + <tagclass>com.arsdigita.bebop.jsp.DefineLink</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>url</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>name</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>image</name> + <tagclass>com.arsdigita.bebop.jsp.DefineImage</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>src</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>alt</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>width</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>height</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>border</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>name</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>tabbedPane</name> + <tagclass>com.arsdigita.bebop.jsp.DefineTabbedPane</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>tab</name> + <tagclass>com.arsdigita.bebop.jsp.DefineTab</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>label</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>text</name> + <tagclass>com.arsdigita.bebop.jsp.DefineText</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineWidgetExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>type</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>size</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>maxlength</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>password</name> + <tagclass>com.arsdigita.bebop.jsp.DefinePassword</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineWidgetExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>size</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>maxlength</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>textArea</name> + <tagclass>com.arsdigita.bebop.jsp.DefineTextArea</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineWidgetExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>type</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>rows</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>cols</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>wrap</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>submit</name> + <tagclass>com.arsdigita.bebop.jsp.DefineSubmit</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>label</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>bundle</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>option</name> + <tagclass>com.arsdigita.bebop.jsp.DefineOption</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>value</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>selected</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>bundle</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>radioGroup</name> + <tagclass>com.arsdigita.bebop.jsp.DefineRadioGroup</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>checkboxGroup</name> + <tagclass>com.arsdigita.bebop.jsp.DefineCheckboxGroup</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>vertical</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>select</name> + <tagclass>com.arsdigita.bebop.jsp.DefineSelect</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>onChange</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>multipleSelect</name> + <tagclass>com.arsdigita.bebop.jsp.DefineMultipleSelect</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>slave</name> + <tagclass>com.arsdigita.bebop.jsp.DefineSlave</tagclass> + <bodycontent>empty</bodycontent> + </tag> + + <tag> + <name>list</name> + <tagclass>com.arsdigita.bebop.jsp.DefineList</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineListExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>table</name> + <tagclass>com.arsdigita.bebop.jsp.DefineTable</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineTableExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> +</taglib> + Added: trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-show.tld =================================================================== --- trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-show.tld 2005-09-29 18:13:24 UTC (rev 929) +++ trunk/ccm-formbuilder-pdf/web/WEB-INF/bebop-show.tld 2005-09-29 19:07:41 UTC (rev 930) @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> + +<taglib> + <tlibversion>1.0</tlibversion> + <jspversion>1.1</jspversion> + <shortname>bebop-define</shortname> + <uri>http://www.arsdigita.com/bebop-define/tld/1.0</uri> + + <info>this is a tag library for showing components from Bebop pages + inside of a JSP.</info> + + <tag> + <name>page</name> + <tagclass>com.arsdigita.bebop.jsp.ShowPage</tagclass> + <teiclass>com.arsdigita.bebop.jsp.ShowPageExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>pageClass</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>master</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>all</name> + <tagclass>com.arsdigita.bebop.jsp.ShowAll</tagclass> + <bodycontent>JSP</bodycontent> + </tag> + + <tag> + <name>component</name> + <tagclass>com.arsdigita.bebop.jsp.ShowComponent</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>form</name> + <tagclass>com.arsdigita.bebop.jsp.ShowForm</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>list</name> + <tagclass>com.arsdigita.bebop.jsp.ShowList</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + + <tag> + <name>listItem</name> + <tagclass>com.arsdigita.bebop.jsp.ShowListItem</tagclass> + <bodycontent>empty</bodycontent> + </tag> + + <tag> + <name>table</name> + <tagclass>com.arsdigita.bebop.jsp.ShowTable</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>thead</name> + <tagclass>com.arsdigita.bebop.jsp.ShowTableHeader</tagclass> + <bodycontent>JSP</bodycontent> + </tag> + + <tag> + <name>tbody</name> + <tagclass>com.arsdigita.bebop.jsp.ShowTableBody</tagclass> + <bodycontent>JSP</bodycontent> + </tag> + + <tag> + <name>row</name> + <tagclass>com.arsdigita.bebop.jsp.ShowTableRow</tagclass> + <bodycontent>JSP</bodycontent> + </tag> + + <tag> + <name>col</name> + <tagclass>com.arsdigita.bebop.jsp.ShowListItem</tagclass> + <bodycontent>empty</bodycontent> + </tag> + + <tag> + <name>slave</name> + <tagclass>com.arsdigita.bebop.jsp.ShowSlave</tagclass> + <bodycontent>JSP</bodycontent> + </tag> +</taglib> Added: trunk/ccm-forum/web/WEB-INF/bebop-define.tld =================================================================== --- trunk/ccm-forum/web/WEB-INF/bebop-define.tld 2005-09-29 18:13:24 UTC (rev 929) +++ trunk/ccm-forum/web/WEB-INF/bebop-define.tld 2005-09-29 19:07:41 UTC (rev 930) @@ -0,0 +1,395 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> + +<taglib> + <tlibversion>1.0</tlibversion> + <jspversion>1.1</jspversion> + <shortname>bebop-define</shortname> + <uri>http://www.arsdigita.com/bebop-define/tld/1.0</uri> + + <info>this is a tag library for defining Bebop pages via JSP.</info> + + <tag> + <name>page</name> + <tagclass>com.arsdigita.bebop.jsp.DefinePage</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefinePageExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>title</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>application</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>master</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>pageClass</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>cache</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>component</name> + <tagclass>com.arsdigita.bebop.jsp.DefineComponentImpl</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineComponentExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>classname</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>form</name> + <tagclass>com.arsdigita.bebop.jsp.DefineForm</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineFormExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>encType</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>method</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>action</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>onSubmit</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>onReset</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>link</name> + <tagclass>com.arsdigita.bebop.jsp.DefineLink</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>url</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>name</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>image</name> + <tagclass>com.arsdigita.bebop.jsp.DefineImage</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>src</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>alt</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>width</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>height</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>border</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>name</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>tabbedPane</name> + <tagclass>com.arsdigita.bebop.jsp.DefineTabbedPane</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>tab</name> + <tagclass>com.arsdigita.bebop.jsp.DefineTab</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>label</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>text</name> + <tagclass>com.arsdigita.bebop.jsp.DefineText</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineWidgetExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>type</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>size</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>maxlength</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>password</name> + <tagclass>com.arsdigita.bebop.jsp.DefinePassword</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineWidgetExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>size</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>maxlength</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>textArea</name> + <tagclass>com.arsdigita.bebop.jsp.DefineTextArea</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineWidgetExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>type</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>rows</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>cols</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>wrap</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>submit</name> + <tagclass>com.arsdigita.bebop.jsp.DefineSubmit</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>label</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>bundle</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>option</name> + <tagclass>com.arsdigita.bebop.jsp.DefineOption</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>value</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>selected</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>bundle</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>radioGroup</name> + <tagclass>com.arsdigita.bebop.jsp.DefineRadioGroup</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>checkboxGroup</name> + <tagclass>com.arsdigita.bebop.jsp.DefineCheckboxGroup</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>vertical</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>select</name> + <tagclass>com.arsdigita.bebop.jsp.DefineSelect</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>onChange</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>multipleSelect</name> + <tagclass>com.arsdigita.bebop.jsp.DefineMultipleSelect</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>slave</name> + <tagclass>com.arsdigita.bebop.jsp.DefineSlave</tagclass> + <bodycontent>empty</bodycontent> + </tag> + + <tag> + <name>list</name> + <tagclass>com.arsdigita.bebop.jsp.DefineList</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineListExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>table</name> + <tagclass>com.arsdigita.bebop.jsp.DefineTable</tagclass> + <teiclass>com.arsdigita.bebop.jsp.DefineTableExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> +</taglib> + Added: trunk/ccm-forum/web/WEB-INF/bebop-show.tld =================================================================== --- trunk/ccm-forum/web/WEB-INF/bebop-show.tld 2005-09-29 18:13:24 UTC (rev 929) +++ trunk/ccm-forum/web/WEB-INF/bebop-show.tld 2005-09-29 19:07:41 UTC (rev 930) @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE taglib PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN" "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd"> + +<taglib> + <tlibversion>1.0</tlibversion> + <jspversion>1.1</jspversion> + <shortname>bebop-define</shortname> + <uri>http://www.arsdigita.com/bebop-define/tld/1.0</uri> + + <info>this is a tag library for showing components from Bebop pages + inside of a JSP.</info> + + <tag> + <name>page</name> + <tagclass>com.arsdigita.bebop.jsp.ShowPage</tagclass> + <teiclass>com.arsdigita.bebop.jsp.ShowPageExtraInfo</teiclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>pageClass</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <name>master</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>all</name> + <tagclass>com.arsdigita.bebop.jsp.ShowAll</tagclass> + <bodycontent>JSP</bodycontent> + </tag> + + <tag> + <name>component</name> + <tagclass>com.arsdigita.bebop.jsp.ShowComponent</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>form</name> + <tagclass>com.arsdigita.bebop.jsp.ShowForm</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + <tag> + <name>list</name> + <tagclass>com.arsdigita.bebop.jsp.ShowList</tagclass> + <bodycontent>JSP</bodycontent> + <attribute> + <name>name</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + + .. |
|
From: <ssk...@vh...> - 2005-09-29 18:23:21
|
Author: sskracic Date: 2005-09-29 20:13:24 +0200 (Thu, 29 Sep 2005) New Revision: 929 Modified: trunk/ccm-ldn-aplaws/bundles/camden/bundle.in trunk/ccm-ldn-aplaws/bundles/complete/bundle.in trunk/ccm-ldn-aplaws/bundles/demo/bundle.in trunk/ccm-ldn-aplaws/bundles/devel/bundle.in trunk/ccm-ldn-aplaws/bundles/standard/bundle.in Log: Tagging bundle RPMs versions independently from those on release, release is "1.0.3" and trunk is "1.0.3devel", so we can have independent RPM release numbering. Modified: trunk/ccm-ldn-aplaws/bundles/camden/bundle.in =================================================================== --- trunk/ccm-ldn-aplaws/bundles/camden/bundle.in 2005-09-29 17:23:53 UTC (rev 928) +++ trunk/ccm-ldn-aplaws/bundles/camden/bundle.in 2005-09-29 18:13:24 UTC (rev 929) @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-camden BUNDLE_PRETTY_NAME="APLAWS+ Camden Bundle" -VERSION=1.0.3 -RELEASE=2 +VERSION=1.0.3devel +RELEASE=1 Modified: trunk/ccm-ldn-aplaws/bundles/complete/bundle.in =================================================================== --- trunk/ccm-ldn-aplaws/bundles/complete/bundle.in 2005-09-29 17:23:53 UTC (rev 928) +++ trunk/ccm-ldn-aplaws/bundles/complete/bundle.in 2005-09-29 18:13:24 UTC (rev 929) @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-complete BUNDLE_PRETTY_NAME="APLAWS+ Complete Bundle" -VERSION=1.0.3 -RELEASE=2 +VERSION=1.0.3devel +RELEASE=1 Modified: trunk/ccm-ldn-aplaws/bundles/demo/bundle.in =================================================================== --- trunk/ccm-ldn-aplaws/bundles/demo/bundle.in 2005-09-29 17:23:53 UTC (rev 928) +++ trunk/ccm-ldn-aplaws/bundles/demo/bundle.in 2005-09-29 18:13:24 UTC (rev 929) @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-demo BUNDLE_PRETTY_NAME="APLAWS+ Demo Bundle" -VERSION=1.0.3 -RELEASE=2 +VERSION=1.0.3devel +RELEASE=1 Modified: trunk/ccm-ldn-aplaws/bundles/devel/bundle.in =================================================================== --- trunk/ccm-ldn-aplaws/bundles/devel/bundle.in 2005-09-29 17:23:53 UTC (rev 928) +++ trunk/ccm-ldn-aplaws/bundles/devel/bundle.in 2005-09-29 18:13:24 UTC (rev 929) @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-devel BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle" -VERSION=1.0.3 -RELEASE=2 +VERSION=1.0.3devel +RELEASE=1 Modified: trunk/ccm-ldn-aplaws/bundles/standard/bundle.in =================================================================== --- trunk/ccm-ldn-aplaws/bundles/standard/bundle.in 2005-09-29 17:23:53 UTC (rev 928) +++ trunk/ccm-ldn-aplaws/bundles/standard/bundle.in 2005-09-29 18:13:24 UTC (rev 929) @@ -1,4 +1,4 @@ BUNDLE_NAME=aplaws-plus-standard BUNDLE_PRETTY_NAME="APLAWS+ Standard Bundle" -VERSION=1.0.3 -RELEASE=2 +VERSION=1.0.3devel +RELEASE=1 |
Author: sskracic
Date: 2005-09-29 19:23:53 +0200 (Thu, 29 Sep 2005)
New Revision: 928
Modified:
releases/1.0.3/ccm-ldn-aplaws/application.xml
releases/1.0.3/ccm-ldn-aplaws/bundles/camden/bundle.in
releases/1.0.3/ccm-ldn-aplaws/bundles/complete/bundle.in
releases/1.0.3/ccm-ldn-aplaws/bundles/demo/bundle.in
releases/1.0.3/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
releases/1.0.3/ccm-ldn-aplaws/bundles/devel/bundle.in
releases/1.0.3/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
releases/1.0.3/ccm-ldn-aplaws/bundles/standard/bundle.in
releases/1.0.3/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
releases/1.0.3/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
Log:
Integrating r927 to 1.0.3 release - web.xml in all Aplaws+
bundles must have portlet-type-xsl servlet mapped.
Modified: releases/1.0.3/ccm-ldn-aplaws/application.xml
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/application.xml 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/application.xml 2005-09-29 17:23:53 UTC (rev 928)
@@ -3,7 +3,7 @@
name="ccm-ldn-aplaws"
prettyName="APLAWS"
version="6.2.0"
- release="1"
+ release="2"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.2.0"/>
Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/camden/bundle.in
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/bundles/camden/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/bundles/camden/bundle.in 2005-09-29 17:23:53 UTC (rev 928)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-camden
BUNDLE_PRETTY_NAME="APLAWS+ Camden Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/complete/bundle.in
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/bundles/complete/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/bundles/complete/bundle.in 2005-09-29 17:23:53 UTC (rev 928)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-complete
BUNDLE_PRETTY_NAME="APLAWS+ Complete Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/demo/bundle.in
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/bundles/demo/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/bundles/demo/bundle.in 2005-09-29 17:23:53 UTC (rev 928)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-demo
BUNDLE_PRETTY_NAME="APLAWS+ Demo Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/bundles/demo/cfg/web.xml 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/bundles/demo/cfg/web.xml 2005-09-29 17:23:53 UTC (rev 928)
@@ -162,7 +162,17 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern>
</servlet-mapping>
Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/devel/bundle.in
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/bundles/devel/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/bundles/devel/bundle.in 2005-09-29 17:23:53 UTC (rev 928)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-devel
BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/bundles/devel/cfg/web.xml 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/bundles/devel/cfg/web.xml 2005-09-29 17:23:53 UTC (rev 928)
@@ -162,7 +162,17 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern>
</servlet-mapping>
Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/standard/bundle.in
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/bundles/standard/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/bundles/standard/bundle.in 2005-09-29 17:23:53 UTC (rev 928)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-standard
BUNDLE_PRETTY_NAME="APLAWS+ Standard Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: releases/1.0.3/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/bundles/standard/cfg/web.xml 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/bundles/standard/cfg/web.xml 2005-09-29 17:23:53 UTC (rev 928)
@@ -162,7 +162,17 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern>
</servlet-mapping>
Modified: releases/1.0.3/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
===================================================================
--- releases/1.0.3/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws 2005-09-29 17:19:07 UTC (rev 927)
+++ releases/1.0.3/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws 2005-09-29 17:23:53 UTC (rev 928)
@@ -171,7 +171,17 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>portal-files</servlet-name>
<url-pattern>/ccm-ldn-portal/files/*</url-pattern>
</servlet-mapping>
|
Author: sskracic
Date: 2005-09-29 19:19:07 +0200 (Thu, 29 Sep 2005)
New Revision: 927
Modified:
trunk/ccm-ldn-aplaws/application.xml
trunk/ccm-ldn-aplaws/bundles/camden/bundle.in
trunk/ccm-ldn-aplaws/bundles/complete/bundle.in
trunk/ccm-ldn-aplaws/bundles/demo/bundle.in
trunk/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
trunk/ccm-ldn-aplaws/bundles/devel/bundle.in
trunk/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
trunk/ccm-ldn-aplaws/bundles/standard/bundle.in
trunk/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
Log:
All bundles should have the portlet-type-xsl servlet mapped,
the development one included.
Modified: trunk/ccm-ldn-aplaws/application.xml
===================================================================
--- trunk/ccm-ldn-aplaws/application.xml 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/application.xml 2005-09-29 17:19:07 UTC (rev 927)
@@ -3,7 +3,7 @@
name="ccm-ldn-aplaws"
prettyName="APLAWS"
version="6.3.0"
- release="1"
+ release="2"
webapp="ROOT">
<ccm:dependencies>
<ccm:requires name="ccm-core" version="6.3.0"/>
Modified: trunk/ccm-ldn-aplaws/bundles/camden/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/camden/bundle.in 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/bundles/camden/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-camden
BUNDLE_PRETTY_NAME="APLAWS+ Camden Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: trunk/ccm-ldn-aplaws/bundles/complete/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/complete/bundle.in 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/bundles/complete/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-complete
BUNDLE_PRETTY_NAME="APLAWS+ Complete Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: trunk/ccm-ldn-aplaws/bundles/demo/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/demo/bundle.in 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/bundles/demo/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-demo
BUNDLE_PRETTY_NAME="APLAWS+ Demo Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: trunk/ccm-ldn-aplaws/bundles/demo/cfg/web.xml
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/demo/cfg/web.xml 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/bundles/demo/cfg/web.xml 2005-09-29 17:19:07 UTC (rev 927)
@@ -162,7 +162,17 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern>
</servlet-mapping>
Modified: trunk/ccm-ldn-aplaws/bundles/devel/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/devel/bundle.in 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/bundles/devel/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-devel
BUNDLE_PRETTY_NAME="APLAWS+ Devel Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: trunk/ccm-ldn-aplaws/bundles/devel/cfg/web.xml
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/devel/cfg/web.xml 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/bundles/devel/cfg/web.xml 2005-09-29 17:19:07 UTC (rev 927)
@@ -162,7 +162,17 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern>
</servlet-mapping>
Modified: trunk/ccm-ldn-aplaws/bundles/standard/bundle.in
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/standard/bundle.in 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/bundles/standard/bundle.in 2005-09-29 17:19:07 UTC (rev 927)
@@ -1,4 +1,4 @@
BUNDLE_NAME=aplaws-plus-standard
BUNDLE_PRETTY_NAME="APLAWS+ Standard Bundle"
VERSION=1.0.3
-RELEASE=1.rc0
+RELEASE=2
Modified: trunk/ccm-ldn-aplaws/bundles/standard/cfg/web.xml
===================================================================
--- trunk/ccm-ldn-aplaws/bundles/standard/cfg/web.xml 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/bundles/standard/cfg/web.xml 2005-09-29 17:19:07 UTC (rev 927)
@@ -162,7 +162,17 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>reg</servlet-name>
<url-pattern>/__ccm__/null/reg/*</url-pattern>
</servlet-mapping>
Modified: trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws
===================================================================
--- trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws 2005-09-23 13:17:10 UTC (rev 926)
+++ trunk/ccm-ldn-aplaws/web/WEB-INF/web.xml-aplaws 2005-09-29 17:19:07 UTC (rev 927)
@@ -171,7 +171,17 @@
</init-param>
</servlet>
+ <servlet>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <servlet-class>com.arsdigita.dispatcher.PortletTypeXSLServlet</servlet-class>
+ </servlet>
+
<servlet-mapping>
+ <servlet-name>portlet-type-xsl</servlet-name>
+ <url-pattern>/__ccm__/servlet/portlet-type/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
<servlet-name>portal-files</servlet-name>
<url-pattern>/ccm-ldn-portal/files/*</url-pattern>
</servlet-mapping>
|
|
From: <ap...@vh...> - 2005-09-23 13:26:38
|
Author: apevec
Date: 2005-09-23 15:17:10 +0200 (Fri, 23 Sep 2005)
New Revision: 926
Modified:
releases/1.0.3/tools/scripts/bin/make-zip
Log:
undo r921 for make-zip
Modified: releases/1.0.3/tools/scripts/bin/make-zip
===================================================================
--- releases/1.0.3/tools/scripts/bin/make-zip 2005-09-23 13:11:26 UTC (rev 925)
+++ releases/1.0.3/tools/scripts/bin/make-zip 2005-09-23 13:17:10 UTC (rev 926)
@@ -78,9 +78,9 @@
unlink File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
chdir $ccm_inst_webapp_dir;
-$command = "find . -name .svn -prune -o -type f -printf '%P\n' | zip -@ ";
+$command = "zip -r ";
$command .= "-y " if ($^O ne 'MSWin32');
-$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
+$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . " *";
`$command`;
print File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . "\n";
if ( !defined $ENV{'CCM_DIST_NOTARS'} || $ENV{'CCM_DIST_NOTARS'} ne '1' ) {
@@ -92,7 +92,7 @@
$file =~ s,\\,/,g;
$file =~ s,^([a-zA-Z]):,/cygdrive/$1,;
}
- CCM::CommandsUtil::runAndExitOnError("find . -name .svn -prune -o -type f -printf '%P\n' | tar -cfT $file -");
+ CCM::CommandsUtil::runAndExitOnError("tar -cf $file *");
CCM::CommandsUtil::runAndExitOnError("gzip -f $file");
print "$file\n";
}
|
|
From: <ap...@vh...> - 2005-09-23 13:20:56
|
Author: apevec
Date: 2005-09-23 15:11:26 +0200 (Fri, 23 Sep 2005)
New Revision: 925
Modified:
trunk/tools/scripts/bin/make-zip
Log:
reverting r921 for make-zip, .svn/ is already filtered during copying
Modified: trunk/tools/scripts/bin/make-zip
===================================================================
--- trunk/tools/scripts/bin/make-zip 2005-09-23 12:48:18 UTC (rev 924)
+++ trunk/tools/scripts/bin/make-zip 2005-09-23 13:11:26 UTC (rev 925)
@@ -78,9 +78,9 @@
unlink File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
chdir $ccm_inst_webapp_dir;
-$command = "find . -name .svn -prune -o -type f -printf '%P\n' | zip -@ ";
+$command = "zip -r ";
$command .= "-y " if ($^O ne 'MSWin32');
-$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
+$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . " *";
`$command`;
print File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . "\n";
if ( !defined $ENV{'CCM_DIST_NOTARS'} || $ENV{'CCM_DIST_NOTARS'} ne '1' ) {
@@ -92,7 +92,7 @@
$file =~ s,\\,/,g;
$file =~ s,^([a-zA-Z]):,/cygdrive/$1,;
}
- CCM::CommandsUtil::runAndExitOnError("find . -name .svn -prune -o -type f -printf '%P\n' | tar -cfT $file -");
+ CCM::CommandsUtil::runAndExitOnError("tar -cf $file *");
CCM::CommandsUtil::runAndExitOnError("gzip -f $file");
print "$file\n";
}
|
|
From: <ssk...@vh...> - 2005-09-23 12:57:51
|
Author: sskracic Date: 2005-09-23 14:48:18 +0200 (Fri, 23 Sep 2005) New Revision: 924 Modified: users/sskracic/bin/make-build-release-area.sh users/sskracic/bin/make-release-area.sh Log: Oh yes. Modified: users/sskracic/bin/make-build-release-area.sh =================================================================== --- users/sskracic/bin/make-build-release-area.sh 2005-09-23 12:42:50 UTC (rev 923) +++ users/sskracic/bin/make-build-release-area.sh 2005-09-23 12:48:18 UTC (rev 924) @@ -4,7 +4,7 @@ set -e -RELEASE=1.0.2 +RELEASE=1.0.3 DIRLIST=$(cd ~/svn/releases/$RELEASE ; echo ccm*) for dir in $DIRLIST Modified: users/sskracic/bin/make-release-area.sh =================================================================== --- users/sskracic/bin/make-release-area.sh 2005-09-23 12:42:50 UTC (rev 923) +++ users/sskracic/bin/make-release-area.sh 2005-09-23 12:48:18 UTC (rev 924) @@ -4,7 +4,7 @@ set -e -RELEASE=1.0.2 +RELEASE=1.0.3 REL_DIR=$HOME/svn/releases/$RELEASE DIRLIST=$(cd $REL_DIR ; echo ccm*) for dir in $DIRLIST |
|
From: <ssk...@vh...> - 2005-09-23 12:52:48
|
Author: sskracic Date: 2005-09-23 14:42:50 +0200 (Fri, 23 Sep 2005) New Revision: 923 Modified: trunk/ccm-ldn-aplaws/bundles/complete/ trunk/ccm-ldn-aplaws/bundles/complete/cfg/ trunk/ccm-ldn-aplaws/bundles/demo/ trunk/ccm-ldn-aplaws/bundles/demo/cfg/ trunk/ccm-ldn-aplaws/bundles/devel/ trunk/ccm-ldn-aplaws/bundles/devel/cfg/ trunk/ccm-ldn-aplaws/bundles/standard/ trunk/ccm-ldn-aplaws/bundles/standard/cfg/ Log: Adjusted svn:ignore property to reflect changes in bundle build process. Property changes on: trunk/ccm-ldn-aplaws/bundles/complete ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh ccm-bundle-aplaws-plus-complete.spec.in configure.in Makefile.am Property changes on: trunk/ccm-ldn-aplaws/bundles/complete/cfg ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile Makefile.am Property changes on: trunk/ccm-ldn-aplaws/bundles/demo ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh configure.in ccm-bundle-aplaws-plus-demo.spec.in Makefile.am Property changes on: trunk/ccm-ldn-aplaws/bundles/demo/cfg ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile Makefile.am Property changes on: trunk/ccm-ldn-aplaws/bundles/devel ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh configure.in Makefile.am ccm-bundle-aplaws-plus-devel.spec.in Property changes on: trunk/ccm-ldn-aplaws/bundles/devel/cfg ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile Makefile.am Property changes on: trunk/ccm-ldn-aplaws/bundles/standard ___________________________________________________________________ Name: svn:ignore - mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh + mkinstalldirs configure configure.in.tmp Makefile.in config.log config.status autom4te.cache ccm-bundle-aplaws-plus-*.spec INSTALL COPYING ccm-bundle-aplaws-plus-*.zip missing ccm-bundle-aplaws-plus-*.tar.gz aclocal.m4 Makefile install-sh configure.in Makefile.am ccm-bundle-aplaws-plus-standard.spec.in Property changes on: trunk/ccm-ldn-aplaws/bundles/standard/cfg ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile Makefile.am |
|
From: <ap...@vh...> - 2005-09-23 12:34:19
|
Author: apevec
Date: 2005-09-23 14:24:31 +0200 (Fri, 23 Sep 2005)
New Revision: 922
Modified:
releases/1.0.3/tools/misc/build-all.sh
Log:
merge r920 build-all.sh dependecy fix
Modified: releases/1.0.3/tools/misc/build-all.sh
===================================================================
--- releases/1.0.3/tools/misc/build-all.sh 2005-09-23 12:22:38 UTC (rev 921)
+++ releases/1.0.3/tools/misc/build-all.sh 2005-09-23 12:24:31 UTC (rev 922)
@@ -157,7 +157,17 @@
then
echo " Found only: $output, check $APPS_FILE and $CCM_APP/$CCM_APP/application.xml"
else
- echo " Application $app_name not built at all, check order of apps in $APPS_FILE"
+ echo
+ echo -n " Application $app_name not built at all"
+ if echo " ${APPS} " | grep -F " ${app_name} " > /dev/null
+ then
+ :
+ else
+ echo -n ", please add it to $APPS_FILE"
+ fi
+ echo
+ echo " Restart the build process with '-r $app_name'"
+ echo
fi
exit 1
@@ -265,15 +275,29 @@
display_usage
fi
+# get rid of newlines
+apps=$(echo $(cat $APPS_FILE))
+
APPS=""
+# First, reorder the supplied list of apps in proper dependency order
+app_build_order=$(grep ccm:requires */*/application.xml | sed 's!^\(ccm-[^/]*\)/.*name="\([^"]*\)".*!\2 \1!' | tsort)
+for app in $app_build_order
+do
+ if echo " ${apps} " | grep -F " ${app} " > /dev/null
+ then
+ APPS="$APPS $app"
+ fi
+done
+
+
BUILD_APPS=""
BOOTSTRAP=1
-for app in `cat $APPS_FILE`; do
- APPS="$APPS $app";
+for app in $APPS
+do
if [ "x$RESTART_FOUND" = "x1" -o "x$RESTART_FROM" = "x$app" ]; then
- RESTART_FOUND=1;
- BOOTSTRAP=0
- BUILD_APPS="$BUILD_APPS $app";
+ RESTART_FOUND=1;
+ BOOTSTRAP=0
+ BUILD_APPS="$BUILD_APPS $app";
fi
done
@@ -281,13 +305,14 @@
BUILD_APPS=$APPS
fi
+
if [ ! -z $RESTART_FROM ] && [ -z $RESTART_FOUND ] && [ $DO_BUILD = 1 ]; then
echo "$RESTART_FROM not found in app list";
display_usage
fi
-echo "Processing apps: $APPS"
-echo "Building apps: $BUILD_APPS"
+echo "Processing apps: $apps"
+echo "Building apps in order: $BUILD_APPS"
BUILD_HOME=`pwd`
VIRTUAL_ROOT=$BUILD_HOME/root
@@ -553,7 +578,7 @@
(
set -e
set_application_properties $i
- $RPM $RPM_ARGS --noscripts --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc -ivh $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
+ $RPM $RPM_ARGS --force --noscripts --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc -Uvh $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
) || exit $?
done
|
|
From: <ap...@vh...> - 2005-09-23 12:32:26
|
Author: apevec
Date: 2005-09-23 14:22:38 +0200 (Fri, 23 Sep 2005)
New Revision: 921
Modified:
releases/1.0.3/tools/devel/make-zip.sh
releases/1.0.3/tools/misc/build-all.sh
releases/1.0.3/tools/scripts/bin/make-zip
releases/1.0.3/tools/scripts/make-zip.sh
Log:
merge tools fixes 918 and 919 from the trunk
Modified: releases/1.0.3/tools/devel/make-zip.sh
===================================================================
--- releases/1.0.3/tools/devel/make-zip.sh 2005-09-23 12:22:34 UTC (rev 920)
+++ releases/1.0.3/tools/devel/make-zip.sh 2005-09-23 12:22:38 UTC (rev 921)
@@ -46,7 +46,7 @@
mkdir -p $BUILD_DIR/usr/share/ccm-devel/projects
mkdir -p $BUILD_DIR/usr/share/ccm-devel/applications
-for file in `find template/ -type f | grep -v Makefile`
+for file in `find template/ -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -not -name '.cvsignore' -printf '%p\n'`
do
target="usr/share/ccm-devel/`echo $file | sed -e 's/custom/@@appname@@/'`"
dir=`echo $target | sed -e 's/\/[^\/]*$//'`
Modified: releases/1.0.3/tools/misc/build-all.sh
===================================================================
--- releases/1.0.3/tools/misc/build-all.sh 2005-09-23 12:22:34 UTC (rev 920)
+++ releases/1.0.3/tools/misc/build-all.sh 2005-09-23 12:22:38 UTC (rev 921)
@@ -602,31 +602,33 @@
(
set -e
- BUNDLE_VERSION=`grep 'VERSION=' tools/bundle/configure.in | sed -e 's/VERSION=//'`
- BUNDLE_RELEASE=`grep 'RELEASE=' tools/bundle/configure.in | sed -e 's/RELEASE=//'`
- TOOLS_VERSION=`grep 'VERSION=' tools/tools/configure.in | sed -e 's/VERSION=//'`
- TOOLS_RELEASE=`grep 'RELEASE=' tools/tools/configure.in | sed -e 's/RELEASE=//'`
- DEVEL_VERSION=`grep 'VERSION=' tools/devel/configure.in | sed -e 's/VERSION=//'`
- DEVEL_RELEASE=`grep 'RELEASE=' tools/devel/configure.in | sed -e 's/RELEASE=//'`
- SCRIPTS_VERSION=`grep 'VERSION=' tools/scripts/configure.in | sed -e 's/VERSION=//'`
- SCRIPTS_RELEASE=`grep 'RELEASE=' tools/scripts/configure.in | sed -e 's/RELEASE=//'`
- cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/junitperf-1.8-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/httpunit-1.5.4-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-java-1.0-1.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/servlet-2.3-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-# cp $HOMERPMDIR/servlet-2.2-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-servlet-tomcat-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-servlet-resin-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-devel-perforce-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-devel-cvs-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
+ BUNDLE_RADIX=`rpm -q --specfile tools/bundle/ccm-tools-bundle.spec`
+ TOOLS_RADIX=`rpm -q --specfile tools/tools/ccm-tools.spec`
+ DEVEL_RADIX=`rpm -q --specfile tools/devel/ccm-devel.spec`
+ SCRIPTS_RADIX=`rpm -q --specfile tools/scripts/ccm-scripts.spec`
+ JUNIT_RADIX=`rpm -q --specfile tools/rpms/junit/junit.spec`
+ JUNITPERF_RADIX=`rpm -q --specfile tools/rpms/junitperf/junitperf.spec`
+ HTTPUNIT_RADIX=`rpm -q --specfile tools/rpms/httpunit/httpunit.spec`
+ CCM_JAVA_RADIX=`rpm -q --specfile tools/rpms/ccm-java/ccm-java.spec`
+ SERVLET_RADIX=`rpm -q --specfile tools/rpms/servlet/servlet.spec`
+ tools_chop=${TOOLS_RADIX%-*}
+ TOOLS_VERSION=${tools_chop##*-}
+ devel_chop=${DEVEL_RADIX%-*}
+ DEVEL_VERSION=${devel_chop##*-}
+ scripts_chop=${SCRIPTS_RADIX%-*}
+ SCRIPTS_VERSION=${scripts_chop##*-}
+
+ for radix in $BUNDLE_RADIX $TOOLS_RADIX $DEVEL_RADIX $SCRIPTS_RADIX $JUNIT_RADIX $JUNITPERF_RADIX $HTTPUNIT_RADIX $CCM_JAVA_RADIX $SERVLET_RADIX
+ do
+ cp ${HOMERPMDIR}/${radix}.noarch.rpm ${BUILD_HOME}/dist/runtime/RPMS
+ if [ -f ${HOMESRPMDIR}/${radix}.src.rpm ]
+ then
+ cp ${HOMESRPMDIR}/${radix}.src.rpm ${BUILD_HOME}/dist/runtime/SRPMS
+ fi
+ done
+
if [ "x$CCM_DIST_NOZIPS" != "x1" ]; then
cp tools/tools/ccm-tools-$TOOLS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
cp tools/tools/ccm-tools-servlet-tomcat-$TOOLS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
@@ -635,17 +637,6 @@
cp tools/scripts/ccm-scripts-$SCRIPTS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
fi
- cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/junitperf-1.8-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/httpunit-1.5.4-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-java-1.0-1.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/servlet-2.3-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-# cp $HOMERPMDIR/servlet-2.2-1ccm.src.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMESRPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
)
for DOC in $RUNTIME_DOCS
Modified: releases/1.0.3/tools/scripts/bin/make-zip
===================================================================
--- releases/1.0.3/tools/scripts/bin/make-zip 2005-09-23 12:22:34 UTC (rev 920)
+++ releases/1.0.3/tools/scripts/bin/make-zip 2005-09-23 12:22:38 UTC (rev 921)
@@ -78,9 +78,9 @@
unlink File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
chdir $ccm_inst_webapp_dir;
-$command = "zip -r ";
+$command = "find . -name .svn -prune -o -type f -printf '%P\n' | zip -@ ";
$command .= "-y " if ($^O ne 'MSWin32');
-$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . " *";
+$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
`$command`;
print File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . "\n";
if ( !defined $ENV{'CCM_DIST_NOTARS'} || $ENV{'CCM_DIST_NOTARS'} ne '1' ) {
@@ -92,7 +92,7 @@
$file =~ s,\\,/,g;
$file =~ s,^([a-zA-Z]):,/cygdrive/$1,;
}
- CCM::CommandsUtil::runAndExitOnError("tar -cf $file *");
+ CCM::CommandsUtil::runAndExitOnError("find . -name .svn -prune -o -type f -printf '%P\n' | tar -cfT $file -");
CCM::CommandsUtil::runAndExitOnError("gzip -f $file");
print "$file\n";
}
Modified: releases/1.0.3/tools/scripts/make-zip.sh
===================================================================
--- releases/1.0.3/tools/scripts/make-zip.sh 2005-09-23 12:22:34 UTC (rev 920)
+++ releases/1.0.3/tools/scripts/make-zip.sh 2005-09-23 12:22:38 UTC (rev 921)
@@ -21,7 +21,7 @@
cp bin/make-zip "$BUILD_DIR/usr/share/ccm-scripts/bin"
cp bin/make-source "$BUILD_DIR/usr/share/ccm-scripts/bin"
-cp --parents `find pkg -type f | grep -v Makefile | grep -v "~" | grep -v "pl.test"` "$BUILD_DIR/usr/share/ccm-scripts"
+cp --parents `find pkg -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -not -name "pl.test" -not -name '.cvsignore' -printf '%p\n'` "$BUILD_DIR/usr/share/ccm-scripts"
mkdir -p "$BUILD_DIR/usr/share/ccm-devel"
cp --parents template/rollingbuild.cmd "$BUILD_DIR/usr/share/ccm-devel"
|
|
From: <ssk...@vh...> - 2005-09-23 12:32:22
|
Author: sskracic
Date: 2005-09-23 14:22:34 +0200 (Fri, 23 Sep 2005)
New Revision: 920
Modified:
trunk/tools/misc/build-all.sh
Log:
build-all is now finally able to sort all supplied application in
the proper dependency order, so that the whole shebang can be done
with simple:
$ echo ccm-* > all-apps.txt
$ tools/misc/build-all.sh all-apps.txt
In the case there's some missing dependency, build-all now tries
to be helpful suggesting the app name that needs to be added to
the app listing file, as well as the tip about restarting the build
process.
Modified: trunk/tools/misc/build-all.sh
===================================================================
--- trunk/tools/misc/build-all.sh 2005-09-23 12:13:43 UTC (rev 919)
+++ trunk/tools/misc/build-all.sh 2005-09-23 12:22:34 UTC (rev 920)
@@ -157,7 +157,17 @@
then
echo " Found only: $output, check $APPS_FILE and $CCM_APP/$CCM_APP/application.xml"
else
- echo " Application $app_name not built at all, check order of apps in $APPS_FILE"
+ echo
+ echo -n " Application $app_name not built at all"
+ if echo " ${APPS} " | grep -F " ${app_name} " > /dev/null
+ then
+ :
+ else
+ echo -n ", please add it to $APPS_FILE"
+ fi
+ echo
+ echo " Restart the build process with '-r $app_name'"
+ echo
fi
exit 1
@@ -265,15 +275,29 @@
display_usage
fi
+# get rid of newlines
+apps=$(echo $(cat $APPS_FILE))
+
APPS=""
+# First, reorder the supplied list of apps in proper dependency order
+app_build_order=$(grep ccm:requires */*/application.xml | sed 's!^\(ccm-[^/]*\)/.*name="\([^"]*\)".*!\2 \1!' | tsort)
+for app in $app_build_order
+do
+ if echo " ${apps} " | grep -F " ${app} " > /dev/null
+ then
+ APPS="$APPS $app"
+ fi
+done
+
+
BUILD_APPS=""
BOOTSTRAP=1
-for app in `cat $APPS_FILE`; do
- APPS="$APPS $app";
+for app in $APPS
+do
if [ "x$RESTART_FOUND" = "x1" -o "x$RESTART_FROM" = "x$app" ]; then
- RESTART_FOUND=1;
- BOOTSTRAP=0
- BUILD_APPS="$BUILD_APPS $app";
+ RESTART_FOUND=1;
+ BOOTSTRAP=0
+ BUILD_APPS="$BUILD_APPS $app";
fi
done
@@ -281,13 +305,14 @@
BUILD_APPS=$APPS
fi
+
if [ ! -z $RESTART_FROM ] && [ -z $RESTART_FOUND ] && [ $DO_BUILD = 1 ]; then
echo "$RESTART_FROM not found in app list";
display_usage
fi
-echo "Processing apps: $APPS"
-echo "Building apps: $BUILD_APPS"
+echo "Processing apps: $apps"
+echo "Building apps in order: $BUILD_APPS"
BUILD_HOME=`pwd`
VIRTUAL_ROOT=$BUILD_HOME/root
@@ -553,7 +578,7 @@
(
set -e
set_application_properties $i
- $RPM $RPM_ARGS --noscripts --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc -ivh $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
+ $RPM $RPM_ARGS --force --noscripts --relocate /usr=$VIRTUAL_ROOT --relocate /etc=$VIRTUAL_ROOT/etc -Uvh $HOMERPMDIR/$APP_NAME-$APP_VERSION-$RELEASE.noarch.rpm
) || exit $?
done
|
|
From: <ap...@vh...> - 2005-09-23 12:23:11
|
Author: apevec
Date: 2005-09-23 14:13:43 +0200 (Fri, 23 Sep 2005)
New Revision: 919
Modified:
trunk/tools/devel/make-zip.sh
trunk/tools/scripts/bin/make-zip
trunk/tools/scripts/make-zip.sh
Log:
don't include .svn in ZIP distro
Modified: trunk/tools/devel/make-zip.sh
===================================================================
--- trunk/tools/devel/make-zip.sh 2005-09-23 10:51:35 UTC (rev 918)
+++ trunk/tools/devel/make-zip.sh 2005-09-23 12:13:43 UTC (rev 919)
@@ -46,7 +46,7 @@
mkdir -p $BUILD_DIR/usr/share/ccm-devel/projects
mkdir -p $BUILD_DIR/usr/share/ccm-devel/applications
-for file in `find template/ -type f | grep -v Makefile`
+for file in `find template/ -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -not -name '.cvsignore' -printf '%p\n'`
do
target="usr/share/ccm-devel/`echo $file | sed -e 's/custom/@@appname@@/'`"
dir=`echo $target | sed -e 's/\/[^\/]*$//'`
Modified: trunk/tools/scripts/bin/make-zip
===================================================================
--- trunk/tools/scripts/bin/make-zip 2005-09-23 10:51:35 UTC (rev 918)
+++ trunk/tools/scripts/bin/make-zip 2005-09-23 12:13:43 UTC (rev 919)
@@ -78,9 +78,9 @@
unlink File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
chdir $ccm_inst_webapp_dir;
-$command = "zip -r ";
+$command = "find . -name .svn -prune -o -type f -printf '%P\n' | zip -@ ";
$command .= "-y " if ($^O ne 'MSWin32');
-$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . " *";
+$command .= File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip");
`$command`;
print File::Spec->catfile($ccm_dist_zip_dir, "$ccm_package_name-bin.zip") . "\n";
if ( !defined $ENV{'CCM_DIST_NOTARS'} || $ENV{'CCM_DIST_NOTARS'} ne '1' ) {
@@ -92,7 +92,7 @@
$file =~ s,\\,/,g;
$file =~ s,^([a-zA-Z]):,/cygdrive/$1,;
}
- CCM::CommandsUtil::runAndExitOnError("tar -cf $file *");
+ CCM::CommandsUtil::runAndExitOnError("find . -name .svn -prune -o -type f -printf '%P\n' | tar -cfT $file -");
CCM::CommandsUtil::runAndExitOnError("gzip -f $file");
print "$file\n";
}
Modified: trunk/tools/scripts/make-zip.sh
===================================================================
--- trunk/tools/scripts/make-zip.sh 2005-09-23 10:51:35 UTC (rev 918)
+++ trunk/tools/scripts/make-zip.sh 2005-09-23 12:13:43 UTC (rev 919)
@@ -21,7 +21,7 @@
cp bin/make-zip "$BUILD_DIR/usr/share/ccm-scripts/bin"
cp bin/make-source "$BUILD_DIR/usr/share/ccm-scripts/bin"
-cp --parents `find pkg -type f | grep -v Makefile | grep -v "~" | grep -v "pl.test"` "$BUILD_DIR/usr/share/ccm-scripts"
+cp --parents `find pkg -name '.svn' -prune -o -type f -not -name "Makefile*" -not -name "*~" -not -name "pl.test" -not -name '.cvsignore' -printf '%p\n'` "$BUILD_DIR/usr/share/ccm-scripts"
mkdir -p "$BUILD_DIR/usr/share/ccm-devel"
cp --parents template/rollingbuild.cmd "$BUILD_DIR/usr/share/ccm-devel"
|
|
From: <ssk...@vh...> - 2005-09-23 11:01:08
|
Author: sskracic
Date: 2005-09-23 12:51:35 +0200 (Fri, 23 Sep 2005)
New Revision: 918
Modified:
trunk/tools/misc/build-all.sh
Log:
Replaced hardcoded pkg version and release numbers with
a lookup to the actual .spec file.
Modified: trunk/tools/misc/build-all.sh
===================================================================
--- trunk/tools/misc/build-all.sh 2005-09-23 09:13:53 UTC (rev 917)
+++ trunk/tools/misc/build-all.sh 2005-09-23 10:51:35 UTC (rev 918)
@@ -602,31 +602,33 @@
(
set -e
- BUNDLE_VERSION=`grep 'VERSION=' tools/bundle/configure.in | sed -e 's/VERSION=//'`
- BUNDLE_RELEASE=`grep 'RELEASE=' tools/bundle/configure.in | sed -e 's/RELEASE=//'`
- TOOLS_VERSION=`grep 'VERSION=' tools/tools/configure.in | sed -e 's/VERSION=//'`
- TOOLS_RELEASE=`grep 'RELEASE=' tools/tools/configure.in | sed -e 's/RELEASE=//'`
- DEVEL_VERSION=`grep 'VERSION=' tools/devel/configure.in | sed -e 's/VERSION=//'`
- DEVEL_RELEASE=`grep 'RELEASE=' tools/devel/configure.in | sed -e 's/RELEASE=//'`
- SCRIPTS_VERSION=`grep 'VERSION=' tools/scripts/configure.in | sed -e 's/VERSION=//'`
- SCRIPTS_RELEASE=`grep 'RELEASE=' tools/scripts/configure.in | sed -e 's/RELEASE=//'`
- cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/junitperf-1.8-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/httpunit-1.5.4-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-java-1.0-1.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/junit-3.8.1-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/servlet-2.3-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
-# cp $HOMERPMDIR/servlet-2.2-1ccm.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-servlet-tomcat-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-servlet-resin-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-devel-perforce-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-devel-cvs-$DEVEL_VERSION-$DEVEL_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMERPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.noarch.rpm $BUILD_HOME/dist/runtime/RPMS
+ BUNDLE_RADIX=`rpm -q --specfile tools/bundle/ccm-tools-bundle.spec`
+ TOOLS_RADIX=`rpm -q --specfile tools/tools/ccm-tools.spec`
+ DEVEL_RADIX=`rpm -q --specfile tools/devel/ccm-devel.spec`
+ SCRIPTS_RADIX=`rpm -q --specfile tools/scripts/ccm-scripts.spec`
+ JUNIT_RADIX=`rpm -q --specfile tools/rpms/junit/junit.spec`
+ JUNITPERF_RADIX=`rpm -q --specfile tools/rpms/junitperf/junitperf.spec`
+ HTTPUNIT_RADIX=`rpm -q --specfile tools/rpms/httpunit/httpunit.spec`
+ CCM_JAVA_RADIX=`rpm -q --specfile tools/rpms/ccm-java/ccm-java.spec`
+ SERVLET_RADIX=`rpm -q --specfile tools/rpms/servlet/servlet.spec`
+ tools_chop=${TOOLS_RADIX%-*}
+ TOOLS_VERSION=${tools_chop##*-}
+ devel_chop=${DEVEL_RADIX%-*}
+ DEVEL_VERSION=${devel_chop##*-}
+ scripts_chop=${SCRIPTS_RADIX%-*}
+ SCRIPTS_VERSION=${scripts_chop##*-}
+
+ for radix in $BUNDLE_RADIX $TOOLS_RADIX $DEVEL_RADIX $SCRIPTS_RADIX $JUNIT_RADIX $JUNITPERF_RADIX $HTTPUNIT_RADIX $CCM_JAVA_RADIX $SERVLET_RADIX
+ do
+ cp ${HOMERPMDIR}/${radix}.noarch.rpm ${BUILD_HOME}/dist/runtime/RPMS
+ if [ -f ${HOMESRPMDIR}/${radix}.src.rpm ]
+ then
+ cp ${HOMESRPMDIR}/${radix}.src.rpm ${BUILD_HOME}/dist/runtime/SRPMS
+ fi
+ done
+
if [ "x$CCM_DIST_NOZIPS" != "x1" ]; then
cp tools/tools/ccm-tools-$TOOLS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
cp tools/tools/ccm-tools-servlet-tomcat-$TOOLS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
@@ -635,17 +637,6 @@
cp tools/scripts/ccm-scripts-$SCRIPTS_VERSION.zip $BUILD_HOME/dist/runtime/ZIPS
fi
- cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/junitperf-1.8-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/httpunit-1.5.4-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-java-1.0-1.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/junit-3.8.1-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/servlet-2.3-1ccm.src.rpm $BUILD_HOME/dist/runtime/SRPMS
-# cp $HOMERPMDIR/servlet-2.2-1ccm.src.rpm $BUILD_HOME/dist/runtime/RPMS
- cp $HOMESRPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-devel-$DEVEL_VERSION-$DEVEL_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-scripts-$SCRIPTS_VERSION-$SCRIPTS_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
- cp $HOMESRPMDIR/ccm-tools-bundle-$BUNDLE_VERSION-$BUNDLE_RELEASE.src.rpm $BUILD_HOME/dist/runtime/SRPMS
)
for DOC in $RUNTIME_DOCS
|
|
From: <ap...@vh...> - 2005-09-23 09:23:20
|
Author: apevec Date: 2005-09-23 11:13:53 +0200 (Fri, 23 Sep 2005) New Revision: 917 Modified: trunk/tools/bundle/configure.in trunk/tools/devel/configure.in trunk/tools/rpms/ccm-java/ccm-java.spec.in trunk/tools/scripts/configure.in trunk/tools/tools/configure.in Log: leveling versions of tools on the trunk Modified: trunk/tools/bundle/configure.in =================================================================== --- trunk/tools/bundle/configure.in 2005-09-23 08:43:59 UTC (rev 916) +++ trunk/tools/bundle/configure.in 2005-09-23 09:13:53 UTC (rev 917) @@ -3,8 +3,8 @@ AC_INIT(ccm-tools-bundle.spec.in) -VERSION=1.0.0 -RELEASE=5 +VERSION=6.3.0 +RELEASE=1 AM_INIT_AUTOMAKE(ccm-tools-bundle, $VERSION) AC_SUBST(RELEASE) Modified: trunk/tools/devel/configure.in =================================================================== --- trunk/tools/devel/configure.in 2005-09-23 08:43:59 UTC (rev 916) +++ trunk/tools/devel/configure.in 2005-09-23 09:13:53 UTC (rev 917) @@ -3,7 +3,7 @@ AC_INIT(ccm-devel.spec.in) -VERSION=2.2.1 +VERSION=6.3.0 RELEASE=1 AM_INIT_AUTOMAKE(ccm-devel, $VERSION) Modified: trunk/tools/rpms/ccm-java/ccm-java.spec.in =================================================================== --- trunk/tools/rpms/ccm-java/ccm-java.spec.in 2005-09-23 08:43:59 UTC (rev 916) +++ trunk/tools/rpms/ccm-java/ccm-java.spec.in 2005-09-23 09:13:53 UTC (rev 917) @@ -1,6 +1,6 @@ Summary: Java related environment variables for CCM Name: ccm-java -Version: 1.0 +Version: 6.3.0 Release: 1 Group: Applications/Internet/CCM License: LGPL Modified: trunk/tools/scripts/configure.in =================================================================== --- trunk/tools/scripts/configure.in 2005-09-23 08:43:59 UTC (rev 916) +++ trunk/tools/scripts/configure.in 2005-09-23 09:13:53 UTC (rev 917) @@ -3,7 +3,7 @@ AC_INIT(ccm-scripts.spec.in) -VERSION=2.1.0 +VERSION=6.3.0 RELEASE=1 AM_INIT_AUTOMAKE(ccm-scripts, $VERSION) Modified: trunk/tools/tools/configure.in =================================================================== --- trunk/tools/tools/configure.in 2005-09-23 08:43:59 UTC (rev 916) +++ trunk/tools/tools/configure.in 2005-09-23 09:13:53 UTC (rev 917) @@ -3,8 +3,8 @@ AC_INIT(ccm-tools.spec.in) -VERSION=2.1.3 -RELEASE=2 +VERSION=6.3.0 +RELEASE=1 AM_INIT_AUTOMAKE(ccm-tools, $VERSION) AC_SUBST(RELEASE) |
18 messages has been excluded from this view by a project administrator.
