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...@re...> - 2004-11-18 19:28:55
|
Author: sskracic Date: 2004-11-18 20:21:19 +0100 (Thu, 18 Nov 2004) New Revision: 111 Modified: tools/trunk/misc/build-all.sh Log: The build process is now finally able to independently build all of CCM packages, both tools and dist. Tested on a machine with no CCM RPMs installed. However, there's still hardcoded directories like /var/ccm-devel/rpm/... Modified: tools/trunk/misc/build-all.sh =================================================================== --- tools/trunk/misc/build-all.sh 2004-11-18 15:11:45 UTC (rev 110) +++ tools/trunk/misc/build-all.sh 2004-11-18 19:21:19 UTC (rev 111) @@ -217,6 +217,8 @@ Provides: perl(POSIX) Provides: perl(Carp) Provides: perl(lib) +Provides: perl +Provides: ant = 0:1.5.0 %description @@ -295,6 +297,8 @@ . $VIRTUAL_ROOT/etc/profile.d/ccm-scripts.sh export CCM_RPM_DIR=/var/ccm-devel/rpm/$USER +export CCM_RPMBUILD_FLAGS="$RPM_ARGS" +export CLASSPATH="$CLASSPATH:$CCM_SHARED_LIB_DIST_DIR/servlet.jar" for i in $BUILD_APPS |
|
From: <ssk...@re...> - 2004-11-18 15:19:13
|
Author: sskracic Date: 2004-11-18 16:11:45 +0100 (Thu, 18 Nov 2004) New Revision: 110 Modified: tools/trunk/misc/build-all.sh Log: ccm-tools should be buildable without ccm-tools installed beforehand. Modified: tools/trunk/misc/build-all.sh =================================================================== --- tools/trunk/misc/build-all.sh 2004-11-17 16:25:58 UTC (rev 109) +++ tools/trunk/misc/build-all.sh 2004-11-18 15:11:45 UTC (rev 110) @@ -108,6 +108,7 @@ HOMERPMDIR="$(eval echo ~$USER)/rpm/RPMS/noarch" HOMESRPMDIR="$(eval echo ~$USER)/rpm/SRPMS" +HOMEBUILDDIR="$(eval echo ~$USER)/rpm/BUILD" RPMDIR="/var/ccm-devel/rpm/$USER/RPMS/noarch" SRPMDIR="/var/ccm-devel/rpm/$USER/SRPMS" @@ -247,12 +248,12 @@ ( set -e cd tools/tools - ./rollingbuild.sh TOOLS_VERSION=`grep 'VERSION=' configure.in | sed -e 's/VERSION=//'` TOOLS_RELEASE=`grep 'RELEASE=' configure.in | sed -e 's/RELEASE=//'` + ccm_tools_home="$HOMEBUILDDIR/ccm-tools-$TOOLS_VERSION" + CCM_TOOLS_HOME="$ccm_tools_home" ./rollingbuild.sh $RPM $RPM_ARGS -ivh --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT --relocate /var=$VIRTUAL_ROOT/var $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOLS_RELEASE.noarch.rpm # $BUILD_HOME/rpm -ivh --relocate /etc=$VIRTUAL_ROOT/etc --relocate /usr=$VIRTUAL_ROOT --relocate /var=$VIRTUAL_ROOT/var --define "_dbpath $VIRTUAL_ROOT/rpmdb" $HOMERPMDIR/ccm-tools-$TOOLS_VERSION-$TOOL_RELEASE.noarch.rpm $HOMERPMDIR/ccm-tools-servlet-tomcat-$TOOLS_VERSION-$TOOL_RELEASE.noarch.rpm $HOMERPMDIR/ccm-tools-servlet-resin-$TOOLS_VERSION-$TOOL_RELEASE.noarch.rpm - echo $CCM_TOOLS_HOME ) || exit $? . $VIRTUAL_ROOT/etc/profile.d/ccm-tools.sh |
|
From: <ssk...@re...> - 2004-11-17 16:33:41
|
Author: sskracic Date: 2004-11-17 17:25:58 +0100 (Wed, 17 Nov 2004) New Revision: 109 Removed: users/sskracic/blah Log: Another test, please ignore. Deleted: users/sskracic/blah =================================================================== --- users/sskracic/blah 2004-11-17 16:25:30 UTC (rev 108) +++ users/sskracic/blah 2004-11-17 16:25:58 UTC (rev 109) @@ -1 +0,0 @@ -blah |
|
From: <ssk...@re...> - 2004-11-17 16:32:55
|
Author: sskracic Date: 2004-11-17 17:25:30 +0100 (Wed, 17 Nov 2004) New Revision: 108 Added: users/sskracic/blah Log: Test, please ignore. Added: users/sskracic/blah =================================================================== --- users/sskracic/blah 2004-11-17 16:23:56 UTC (rev 107) +++ users/sskracic/blah 2004-11-17 16:25:30 UTC (rev 108) @@ -0,0 +1 @@ +blah |
|
From: <ssk...@re...> - 2004-11-17 16:31:24
|
Author: sskracic
Date: 2004-11-17 17:23:56 +0100 (Wed, 17 Nov 2004)
New Revision: 107
Added:
users/sskracic/
users/sskracic/bin/
users/sskracic/bin/pgcompare.tcl
Log:
Tcl utility that compares the metadata of two Postgres databases.
Added: users/sskracic/bin/pgcompare.tcl
===================================================================
--- users/sskracic/bin/pgcompare.tcl 2004-11-17 10:56:55 UTC (rev 106)
+++ users/sskracic/bin/pgcompare.tcl 2004-11-17 16:23:56 UTC (rev 107)
@@ -0,0 +1,231 @@
+#! /usr/bin/tclsh
+
+proc has_option {opt} {
+ upvar options options
+ set yield [expr {[lsearch -exact $options $opt] > -1}]
+ return $yield
+}
+
+set usage "Usage: $argv0 \[options\] db1 db2
+ Options:
+
+ -t <type> limit comparison scope to objects of <type>
+ only. Possible values for <type>:
+ sequence, function, view, table,
+ constraint, trigger, index
+ -n report only object names, w/o definition
+ -1 suppress objects unique to db1
+ -2 suppress objects unique to db2
+ -12 suppress objects contained in both databases
+ -c append contraint definitions to tables
+ -i append index definitions to tables
+ -s shows identical objects only (implies -1 -2, ignores -12)
+ -d shows different objects only (implies -1 -2, ignores -12)
+ -h -? shows this help text
+ -- end of options
+
+ Multiple options can be specified, although this doesn't
+ make sense sometimes. The default is -1 -2.
+"
+
+
+set err [list]
+
+set filter "*"
+set options [list]
+for {set optionc 0} {$optionc < [llength $argv]} {incr optionc} {
+ set arg [lindex $argv $optionc]
+ if {[regexp -- {-(.*)} $arg all opt]} {
+ switch -exact -- $opt {
+ "-" { break }
+ "t" { set filter [lindex $argv [incr optionc]] ; lappend options $opt }
+ "n" -
+ "1" -
+ "2" -
+ "12" -
+ "c" -
+ "i" -
+ "s" -
+ "h" -
+ "?" -
+ "d" { lappend options $opt }
+ default { lappend err "Invalid option: -$opt" }
+ }
+ } else {
+ break
+ }
+}
+
+if {[has_option h] || [has_option ?]} {
+ puts $usage
+ exit 2
+}
+
+if {[expr $optionc + 2] != [llength $argv]} {
+ lappend err "Exactly 2 database names must be specified"
+}
+
+if {[llength $err]} {
+ puts [join $err "\n"]
+ puts $usage
+ exit 1
+}
+
+set db1 [lindex $argv $optionc]
+set db2 [lindex $argv [expr $optionc + 1]]
+
+if {[has_option d] || [has_option s]} {
+ lappend options 1 2
+ # remove 12
+ set options [lsearch -all -inline -not $options 12]
+}
+
+if {[lsearch $options {[12]}] == -1} {
+ lappend options 1 2
+}
+
+
+# Now the only thing left to do is some crazy regexp matching
+
+# For each object type we want to compare, we specify a regexp which
+# should hopefully grab the object definition from the dump file
+
+set types(view) {--\n\n(CREATE VIEW (\S+?) .*?;)()\n}
+set types(function) {--\n\n(CREATE FUNCTION (\S+?) .*?LANGUAGE (?:c|plpgsql);)()\n}
+set types(table) {--\n\n(CREATE TABLE ((\S+?)) .*?;)\n}
+set types(sequence) {--\n\n(CREATE SEQUENCE (\S+?)\n.*?;)()\n}
+set types(constraint) {--\n\n(ALTER TABLE ONLY (\S+?)\n *?ADD CONSTRAINT (\S+?) .*?;)\n}
+set types(trigger) {--\n\n(CREATE TRIGGER (\S+?)\n *?(?:AFTER|BEFORE) (?:INSERT|DELETE|UPDATE) ON (\S+?)\n.*?;)\n}
+set types(index) {--\n\n(CREATE (?:UNIQUE )??INDEX (\S+?) ON (\S+?) .*?;)\n}
+
+# For each object in the catalog, we will make an entry in objects array.
+# The key of the entry will look like $object_type:$table_name:$object_name,
+# and the value will be object definition. Note that $table_name only
+# has meaning for constraints, triggers, indices and (redundantly) tables.
+# For views, functions and sequences this part is empty.
+
+foreach dbindex {db1 db2} {
+
+ set dbname [set $dbindex]
+
+ puts "Obtaining schema for $dbname"
+ set dbschema [exec pg_dump -s $dbname]
+
+ foreach type [array names types -glob $filter] {
+ puts " Fetching definition for object type: $type"
+ set rgxp $types($type)
+ set matches [regexp -inline -all -- $rgxp $dbschema]
+ # We must not forget that each regexp match will produce 4 elements in the $matches list.
+ # First element is complete match, while second is the definition.
+ # The third one is object name, except for the constraints where the table name comes first.
+ for {set i 0} {$i < [llength $matches]} {incr i 4} {
+ set definition [lindex $matches [expr $i + 1]]
+ if {"$type" == "constraint"} {
+ set table_name [lindex $matches [expr $i + 2]]
+ set obj_name [lindex $matches [expr $i + 3]]
+ } else {
+ set obj_name [lindex $matches [expr $i + 2]]
+ set table_name [lindex $matches [expr $i + 3]]
+ }
+ set key "$type:$table_name:$obj_name"
+ set objects[set dbindex]($key) $definition
+ }
+ }
+
+ if {[has_option c]} {
+ # Now we will append constraint definitions to tables, sorted by constraint name
+ foreach constraint_key [lsort [array names objects$dbindex {constraint:*}]] {
+ set keylist [split $constraint_key :]
+ set tablename [lindex $keylist 1]
+ set table_key "table:$tablename:$tablename"
+ append objects[set dbindex]($table_key) "\n[set objects[set dbindex]($constraint_key)]"
+ # remove this constraint from object listing
+ array unset objects$dbindex $constraint_key
+ }
+ }
+
+ if {[has_option i]} {
+ # Now we will append index definitions to tables
+ foreach index_key [lsort [array names objects$dbindex {index:*}]] {
+ set keylist [split $index_key :]
+ set tablename [lindex $keylist 1]
+ set table_key "table:$tablename:$tablename"
+ append objects[set dbindex]($table_key) "\n[set objects[set dbindex]($index_key)]"
+ # remove this index from object listing
+ array unset objects$dbindex $index_key
+ }
+ }
+
+}
+
+set onlyindb1 [list]
+set onlyindb2 [list]
+set inboth [list]
+
+set indb1 [array names objectsdb1]
+set indb2 [array names objectsdb2]
+
+foreach entry [lsort -unique [concat $indb1 $indb2]] {
+ set in1 [lsearch $indb1 $entry]
+ set in2 [lsearch $indb2 $entry]
+ if {$in1 >= 0 && $in2 >= 0} {
+ lappend inboth $entry
+ } elseif {$in1 >= 0} {
+ lappend onlyindb1 $entry
+ } elseif {$in2 >= 0} {
+ lappend onlyindb2 $entry
+ }
+}
+
+puts "Number of objects appearing in both databases: [llength $inboth]"
+puts "Number of objects unique to $db1: [llength $onlyindb1]"
+puts "Number of objects unique to $db2: [llength $onlyindb2]"
+
+if {![has_option 1]} {
+ foreach entry $onlyindb1 {
+ puts "ONLY IN $db1: $entry"
+ if {![has_option n]} {
+ puts "$objectsdb1($entry)"
+ puts "---"
+ }
+ }
+}
+
+if {![has_option 2]} {
+ foreach entry $onlyindb2 {
+ puts "ONLY IN $db2: $entry"
+ if {![has_option n]} {
+ puts "$objectsdb2($entry)"
+ puts "---"
+ }
+ }
+}
+
+if {![has_option 12]} {
+ foreach entry $inboth {
+ # Now compare two
+ set definition1 [string map {" " ""} $objectsdb1($entry)]
+ set definition2 [string map {" " ""} $objectsdb2($entry)]
+ if {[string equal -nocase $definition1 $definition2]} {
+ if {![has_option d]} {
+ puts "IDENTICAL: $entry"
+ if {![has_option n]} {
+ puts "$objectsdb1($entry)"
+ puts "---"
+ }
+ }
+ } else {
+ if {![has_option s]} {
+ puts "DIFFERENCE: $entry"
+ if {![has_option n]} {
+ puts "$db1: $objectsdb1($entry)"
+ puts "$db2: $objectsdb2($entry)"
+ puts "---"
+ }
+ }
+ }
+ }
+}
+
+
+
Property changes on: users/sskracic/bin/pgcompare.tcl
___________________________________________________________________
Name: svn:executable
+ *
|
|
From: <mb...@re...> - 2004-11-17 11:04:31
|
Author: mbooth
Date: 2004-11-17 11:56:55 +0100 (Wed, 17 Nov 2004)
New Revision: 106
Added:
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DomainNavigationModel.java
Modified:
ccm-ldn-navigation/trunk/application.xml
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java
ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java
Log:
Add DomainNavigationModel, which allows you to specific a particular domain.
Fix a bug in AbstractTree which would generate invalid URLs for a widget included in a navigation app which pulls out categories not in the current app.
Modified: ccm-ldn-navigation/trunk/application.xml
===================================================================
--- ccm-ldn-navigation/trunk/application.xml 2004-11-17 10:51:56 UTC (rev 105)
+++ ccm-ldn-navigation/trunk/application.xml 2004-11-17 10:56:55 UTC (rev 106)
@@ -11,6 +11,7 @@
<ccm:requires name="ccm-core" version="6.1.0"/>
<ccm:requires name="ccm-cms" version="6.1.0"/>
<ccm:requires name="ccm-ldn-util" version="1.4.1"/>
+ <ccm:requires name="ccm-ldn-terms" version="1.0.1"/>
</ccm:dependencies>
<ccm:contacts>
Added: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DomainNavigationModel.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DomainNavigationModel.java 2004-11-17 10:51:56 UTC (rev 105)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DomainNavigationModel.java 2004-11-17 10:56:55 UTC (rev 106)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+package com.arsdigita.london.navigation;
+
+import com.arsdigita.categorization.Category;
+import com.arsdigita.kernel.ACSObject;
+
+import com.arsdigita.london.terms.Domain;
+
+import org.apache.log4j.Logger;
+
+/**
+ * The Domain navigation model returns the
+ * root category of a specified Domain
+ */
+public class DomainNavigationModel extends AbstractNavigationModel {
+ private static final Logger s_log =
+ Logger.getLogger( DomainNavigationModel.class );
+
+ private String m_domainKey;
+
+ public DomainNavigationModel( String domainKey ) {
+ m_domainKey = domainKey;
+ }
+
+ private Category getDomainRoot() {
+ Domain domain = Domain.retrieve( m_domainKey );
+ Category root = domain.getModel();
+
+ if( s_log.isDebugEnabled() ) {
+ s_log.debug( "Got root category " + root.getOID().toString() +
+ " for domain " + m_domainKey );
+ }
+
+ return root;
+ }
+
+ protected ACSObject loadObject() {
+ return null;
+ }
+
+ protected Category loadCategory() {
+ return getDomainRoot();
+ }
+
+ protected Category[] loadCategoryPath() {
+ return new Category[]{ getDomainRoot() };
+ }
+
+ protected Category loadRootCategory() {
+ return getDomainRoot();
+ }
+}
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java 2004-11-17 10:51:56 UTC (rev 105)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java 2004-11-17 10:56:55 UTC (rev 106)
@@ -31,12 +31,15 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.log4j.Logger;
+
/**
* Abstract class for displaying a list of categories
*/
public abstract class AbstractList extends CategoryComponent {
+ private static final Logger s_log = Logger.getLogger( AbstractList.class );
private String m_name;
@@ -49,6 +52,12 @@
public Element generateXML(HttpServletRequest request,
HttpServletResponse response) {
Category cat = getCategory(getModel());
+
+ if( s_log.isDebugEnabled() ) {
+ String catStr = (null == cat) ? "null" : cat.getOID().toString();
+ s_log.debug( "Got category: " + catStr );
+
+ }
if (cat == null) {
return null;
Modified: ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java
===================================================================
--- ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java 2004-11-17 10:51:56 UTC (rev 105)
+++ ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java 2004-11-17 10:56:55 UTC (rev 106)
@@ -24,12 +24,12 @@
import com.arsdigita.categorization.Category;
import com.arsdigita.categorization.CategoryCollection;
+import com.arsdigita.web.Application;
+import com.arsdigita.web.URL;
+import com.arsdigita.web.Web;
import com.arsdigita.xml.Element;
import com.arsdigita.xml.XML;
-import com.arsdigita.web.Web;
-import com.arsdigita.web.URL;
-
import java.util.Set;
import java.util.TreeSet;
import java.util.Map;
@@ -66,8 +66,28 @@
}
String url = null;
- if (Web.getContext().getApplication() instanceof Navigation) {
- url = "";
+ Application app = Web.getContext().getApplication();
+ if (app instanceof Navigation) {
+ // Check the current category is actually in the current
+ // application's category hierarchy
+
+ Category root = Category.getRootForObject( app );
+
+ CategoryCollection rootPath = root.getDefaultAscendants();
+ CategoryCollection path = cat.getDefaultAscendants();
+
+ boolean common = true;
+ while( common && rootPath.next() ) {
+ if( ! path.next() ||
+ ! rootPath.getID().equals( path.getID() ) )
+ {
+ common = false;
+ }
+ }
+ rootPath.close();
+ path.close();
+
+ if( common ) url = "";
}
return generateNodeXML(request,
|
|
From: <mb...@re...> - 2004-11-17 10:59:32
|
Author: mbooth
Date: 2004-11-17 11:51:56 +0100 (Wed, 17 Nov 2004)
New Revision: 105
Modified:
ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Domain.java
Log:
Make getModel() public
Modified: ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Domain.java
===================================================================
--- ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Domain.java 2004-11-15 15:34:17 UTC (rev 104)
+++ ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Domain.java 2004-11-17 10:51:56 UTC (rev 105)
@@ -218,7 +218,7 @@
}
*/
- Category getModel() {
+ public Category getModel() {
return (Category)DomainObjectFactory
.newInstance((DataObject)get(MODEL));
}
|
|
From: /usr/lib/subversion/tools/hook-scripts/commit-email.pl: `/usr/bin/svnlook.info/var/svn/aplaws.-r.104'.failed.with.this.output:@redhat.com - 2004-11-15 15:41:58
|
Author: /usr/lib/subversion/tools/hook-scripts/commit-email.pl: `/usr/bin/svnlook info /var/svn/aplaws -r 104' failed with this output: Date: svn: Berkeley DB error while opening 'copies' table for filesystem /var/svn/aplaws/db: New Revision: 104 Modified: Log: /usr/lib/subversion/tools/hook-scripts/commit-email.pl: `/usr/bin/svnlook diff /var/svn/aplaws -r 104' failed with this output: svn: Berkeley DB error while opening 'nodes' table for filesystem /var/svn/aplaws/db: Cannot allocate memory |
|
From: <ssk...@re...> - 2004-11-13 01:12:00
|
Author: sskracic
Date: 2004-11-13 02:04:39 +0100 (Sat, 13 Nov 2004)
New Revision: 103
Modified:
tools/trunk/misc/expand-dependencies
Log:
Fixing prototype mismatch(es).
Modified: tools/trunk/misc/expand-dependencies
===================================================================
--- tools/trunk/misc/expand-dependencies 2004-11-13 00:46:27 UTC (rev 102)
+++ tools/trunk/misc/expand-dependencies 2004-11-13 01:04:39 UTC (rev 103)
@@ -2,8 +2,8 @@
use strict;
-sub traverse_deps;
-sub get_direct_deps;
+sub traverse_deps ($$$);
+sub get_direct_deps ($);
if ($#ARGV != 1) {
print "syntax: expand-dependencies BUILD_DIR ccm-app-name\n:";
|
|
From: <ssk...@re...> - 2004-11-13 00:53:40
|
Author: sskracic Date: 2004-11-13 01:46:27 +0100 (Sat, 13 Nov 2004) New Revision: 102 Modified: tools/trunk/misc/build-all.sh Log: Added one more 'Provides:' clause to fake.spec. Modified: tools/trunk/misc/build-all.sh =================================================================== --- tools/trunk/misc/build-all.sh 2004-11-13 00:09:43 UTC (rev 101) +++ tools/trunk/misc/build-all.sh 2004-11-13 00:46:27 UTC (rev 102) @@ -209,6 +209,7 @@ Provides: perl(Exporter) Provides: perl(vars) Provides: perl(Cwd) +Provides: perl(File::Basename) Provides: perl(File::Spec) Provides: perl(File::Copy) Provides: perl(File::Find) |
|
From: <ssk...@re...> - 2004-11-13 00:17:03
|
Author: sskracic
Date: 2004-11-13 01:09:43 +0100 (Sat, 13 Nov 2004)
New Revision: 101
Modified:
tools/trunk/misc/build-all.sh
Log:
Yeah, make sure some stale project.xml does not
get in the way of the build process.
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2004-11-12 22:41:29 UTC (rev 100)
+++ tools/trunk/misc/build-all.sh 2004-11-13 00:09:43 UTC (rev 101)
@@ -305,6 +305,7 @@
# We will generate the <ccm:prebuilt> block by expanding
# the <ccm:dependencies> for each required CCM app in turn.
# The actual crunching work will be done by a perl script.
+ rm -f project.xml
cat > project.xml <<EOF
<?xml version="1.0" encoding="ISO-8859-1"?>
|
|
From: <ssk...@re...> - 2004-11-12 22:48:44
|
Author: sskracic
Date: 2004-11-12 23:41:29 +0100 (Fri, 12 Nov 2004)
New Revision: 100
Added:
tools/trunk/misc/expand-dependencies
Modified:
tools/trunk/misc/build-all.sh
Log:
Dependency expansion now properly handled by a Perl script.
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2004-11-12 21:17:15 UTC (rev 99)
+++ tools/trunk/misc/build-all.sh 2004-11-12 22:41:29 UTC (rev 100)
@@ -302,12 +302,9 @@
set -e
cd $i
# Generate skeleton project.xml.
- # We will cheat and simply copy the <ccm:dependencies>
- # from application.xml into <ccm:prebuilt> block of
- # project.xml. By doing this we will satisfy
- # the dependency information needed to perform XSL
- # transformation when creating the build.xml.
- appxml=$(cat $i/application.xml)
+ # We will generate the <ccm:prebuilt> block by expanding
+ # the <ccm:dependencies> for each required CCM app in turn.
+ # The actual crunching work will be done by a perl script.
cat > project.xml <<EOF
<?xml version="1.0" encoding="ISO-8859-1"?>
@@ -322,7 +319,8 @@
</ccm:build>
<ccm:prebuilt>
-$(sed -n '/<ccm:dependencies>/,/<\/ccm:dependencies>/s/requires/application/p' < $CCM_APP/application.xml)
+$($BUILD_HOME/tools/misc/expand-dependencies $BUILD_HOME $CCM_APP | \
+ sed 's/\(.*\) -> \(.*\)/<ccm:application name="\1" version="\2"\/>/')
</ccm:prebuilt>
</ccm:project>
Added: tools/trunk/misc/expand-dependencies
===================================================================
--- tools/trunk/misc/expand-dependencies 2004-11-12 21:17:15 UTC (rev 99)
+++ tools/trunk/misc/expand-dependencies 2004-11-12 22:41:29 UTC (rev 100)
@@ -0,0 +1,76 @@
+#! /usr/bin/perl -w
+
+use strict;
+
+sub traverse_deps;
+sub get_direct_deps;
+
+if ($#ARGV != 1) {
+ print "syntax: expand-dependencies BUILD_DIR ccm-app-name\n:";
+ exit -1;
+}
+
+my ($build_dir, $app_name) = (shift, shift);
+my %alldeps;
+traverse_deps($build_dir, $app_name, \%alldeps);
+foreach (keys %alldeps) {
+ print "$_ -> $alldeps{$_}\n";
+}
+exit;
+
+
+# Given the app name, finds all direct dependencies this
+# app has (calling get_direct_deps), and then recursively
+# calls itself to expand the dependency list.
+# The final list is automagically freed from duplicates,
+# thanks to hashes.
+#
+# Arguments:
+# 1. BUILD_DIR
+# 2. app name
+# 3. reference to expanded dependency hash (processed so far).
+#
+sub traverse_deps ($$$) {
+ my ($build_dir, $app_name, $expanded_deps_ref) = (shift, shift, shift);
+ my $xml_file = "$build_dir/$app_name/$app_name/application.xml";
+ my %deps = get_direct_deps($xml_file);
+ foreach (keys %deps) {
+ $expanded_deps_ref->{$_} = $deps{$_};
+ traverse_deps($build_dir, $_, $expanded_deps_ref);
+ }
+}
+
+
+# Parses the application.xml for the given app
+# and returns the hash with required app names as keys,
+# and version number as value.
+# Arguments:
+# 1. path to application.xml
+# Returns:
+# - hash of the form:
+# ccm-ldn-util -> 1.4.1
+# ccm-core -> 6.1.0
+# ccm-ldn-terms -> 1.0.1
+# ccm-cms -> 6.1.0
+#
+sub get_direct_deps ($) {
+ my $app_filepath = shift;
+ my %deps;
+ open FILE, "<$app_filepath" or die "Could not open app file: $|";
+ my @app_xml = <FILE>;
+ my $app_name;
+ # First get the app name out of XML
+ if ("@app_xml" =~ m{<ccm:application\b[^>]*\bname="([^"]+)"[^>]*>}s) {
+ $app_name = $1;
+ } else {
+ die "Could not find application name in $app_filepath";
+ }
+
+ # Extract the <ccm:dependencies> block
+ if ("@app_xml" =~ m{<ccm:dependencies>(.*)</ccm:dependencies>}s) {
+ $_ = $1;
+ %deps = m{<ccm:requires name="([^"]*)" version="([^"]*)"[^/>]*/>}sg;
+ }
+ return %deps;
+}
+
Property changes on: tools/trunk/misc/expand-dependencies
___________________________________________________________________
Name: svn:executable
+ *
|
|
From: <mb...@re...> - 2004-11-12 21:24:48
|
Author: mbooth
Date: 2004-11-12 22:17:15 +0100 (Fri, 12 Nov 2004)
New Revision: 99
Modified:
ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java
Log:
Forgot to add automatic persistence on remove
Modified: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java
===================================================================
--- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java 2004-11-11 23:58:35 UTC (rev 98)
+++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java 2004-11-12 21:17:15 UTC (rev 99)
@@ -250,6 +250,13 @@
*/
public void remove( String key ) {
m_prefs.remove( key );
+
+ // XXX: remove the line below when lazy persistence works
+ if( !m_prefs.isEmpty() ) {
+ getPersistent().removeValue( key );
+ } else {
+ getPersistent().delete();
+ }
}
/**
@@ -264,9 +271,13 @@
public void remove( String key, boolean persist ) {
remove( key );
- if( persist ) {
- getPersistent().removeValue( key );
- }
+ //if( persist ) {
+ if( !m_prefs.isEmpty() ) {
+ getPersistent().removeValue( key );
+ } else {
+ getPersistent().delete();
+ }
+ //}
}
/**
|
Author: mbooth Date: 2004-11-12 00:58:35 +0100 (Fri, 12 Nov 2004) New Revision: 98 Modified: ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/HTTPAuth.pdl ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/Nonce.pdl ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/UserLogin.pdl ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuth.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthConfig.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/Initializer.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/Loader.java ccm-auth-http/trunk/src/com/arsdigita/auth/http/RedirectLoginModule.java ccm-cms-types-address/trunk/sql/ccm-cms-types-address/default/upgrade/address-upgrade-1.sql ccm-cms-types-esdservice/trunk/pdl/com/arsdigita/content-types/ESDService.pdl ccm-cms-types-esdservice/trunk/sql/ccm-cms-types-esdservice/oracle-se-create.sql ccm-cms-types-esdservice/trunk/sql/ccm-cms-types-esdservice/postgres-create.sql ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ESDService.java ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ESDServiceInitializer.java ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ESDServiceLoader.java ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ui/ESDServiceChooseContactStep.java ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ui/ESDServiceContactsTable.java ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ui/ESDServicePropertiesForm.java ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ui/ESDServicePropertiesStep.java ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/util/ESDServiceGlobalizationUtil.java ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/util/ESDServiceResourceBundle.java ccm-cms-types-filestorageitem/trunk/sql/ccm-cms-types-filestorageitem/default/upgrade/update-description-nullable.sql ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/PublishedHTMLProvider.java ccm-core/trunk/src/com/arsdigita/persistence/pdl/TestPDLGenerator.java ccm-core/trunk/src/com/arsdigita/versioning/package.html ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/CoreTestSetup.java ccm-core/trunk/test/src/com/arsdigita/tools/junit/extensions/TestStartup.java ccm-core/trunk/test/src/com/arsdigita/util/DummyServletConfig.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLCacheTest.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLPoolTest.java ccm-core/trunk/test/src/com/arsdigita/util/url/URLTestSuite.java ccm-core/trunk/test/src/com/arsdigita/web/DispatcherTest.java ccm-core/trunk/test/src/com/arsdigita/web/DummyServlet.java ccm-ldn-aplaws/trunk/sql/oracle-se/upgrade/1.1.18-1.2.10/table-vc_objects.sql ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Initializer.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/Loader.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ObjectTypeSchemaGenerator.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ObjectTypeTraversal.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ObjectTypeTraversalAdapter.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/SimpleObjectTypeTraversalAdapter.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/WebAppPatternGenerator.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/AssignedItemTerms.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/CategoryPortalSelectionModel.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/CategoryTermDetails.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/ItemCategoryPicker.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/SimplePage.java ccm-ldn-aplaws/trunk/src/com/arsdigita/aplaws/ui/TermItemSummary.java ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZ.pdl ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZCategoryProvider.pdl ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZItemProvider.pdl ccm-ldn-atoz/trunk/pdl/com/arsdigita/london/atoz/AtoZProvider.pdl ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AbstractAtoZGenerator.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZ.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZAtomicEntry.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZCategoryGenerator.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZCategoryProvider.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZCompoundEntry.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZConfig.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZEntry.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZGenerator.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZItemGenerator.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZItemProvider.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZProvider.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/AtoZProviderType.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/Initializer.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/Loader.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/AtoZPane.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/AdminPane.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAdmin.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderAliasList.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlackList.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderBlockForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/CategoryProviderForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ItemProviderAdmin.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ItemProviderForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ProviderAdmin.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ProviderCreateForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ProviderDetails.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ProviderForm.java ccm-ldn-atoz/trunk/src/com/arsdigita/london/atoz/ui/admin/ProviderList.java ccm-ldn-dublin/trunk/pdl/com/arsdigita/london/cms/dublin/query-getRelatedItems.pdl ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/DublinCoreConfig.java ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/Initializer.java ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/RelatedItemsQueryFactoryImpl.java ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/RelatedItemsQueryImpl.java ccm-ldn-dublin/trunk/src/com/arsdigita/london/cms/dublin/ui/ControlledList.java ccm-ldn-dublin/trunk/test/src/com/arsdigita/london/cms/dublin/DublinSuite.java ccm-ldn-dublin/trunk/test/src/com/arsdigita/london/cms/dublin/DublinTestSetup.java ccm-ldn-dublin/trunk/test/src/com/arsdigita/london/cms/dublin/RelatedItemsTest.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/CategoryExportTool.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/CategoryExporter.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/Exporter.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/ExporterConfig.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/Initializer.java ccm-ldn-exporter/trunk/src/com/arsdigita/london/exporter/ItemExportTool.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Initializer.java ccm-ldn-freeform/trunk/src/com/arsdigita/london/cms/freeform/Loader.java ccm-ldn-image-step/trunk/src/com/arsdigita/cms/ItemImageAttachmentInitializer.java ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ItemImageAttachment.java ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ui/ImageStep.java ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ui/ImageStepDisplay.java ccm-ldn-image-step/trunk/src/com/arsdigita/cms/contenttypes/ui/ImageStepEdit.java ccm-ldn-importer/trunk/src/com/arsdigita/london/importer/Initializer.java ccm-ldn-importer/trunk/src/com/arsdigita/london/importer/Loader.java ccm-ldn-importer/trunk/src/com/arsdigita/london/importer/cms/AssetImportTool.java ccm-ldn-importer/trunk/src/com/arsdigita/london/importer/cms/ItemImportTool.java ccm-ldn-navigation/trunk/doc/experimental/AbstractComponentWrapper.java ccm-ldn-navigation/trunk/doc/experimental/ComponentWrapper.java ccm-ldn-navigation/trunk/doc/experimental/DevSupportComponentWrapper.java ccm-ldn-navigation/trunk/pdl/com/arsdigita/london/navigation/QuickLink.pdl ccm-ldn-navigation/trunk/pdl/com/arsdigita/london/navigation/portlet/ItemListPortlet.pdl ccm-ldn-navigation/trunk/pdl/com/arsdigita/london/navigation/portlet/ObjectListPortlet.pdl ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/AbstractNavigationModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ApplicationNavigationModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionDefinition.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DataCollectionRenderer.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/DefaultNavigationModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/GenericNavigationModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/GlobalNavigationModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Initializer.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Loader.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Navigation.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/NavigationConfig.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/NavigationContext.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/NavigationFileResolver.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/NavigationModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/QuickLink.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/RelatedItemsQuery.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/RelatedItemsQueryFactory.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/RelatedItemsQueryFactoryImpl.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/RelatedItemsQueryImpl.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/Template.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/TemplateCollection.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/TemplateMapping.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/TemplateTool.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/cms/CMSDataCollectionDefinition.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/cms/CMSDataCollectionRenderer.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/cms/CMSNavigationModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/portlet/ItemListPortlet.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/portlet/ObjectListPortlet.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/tools/TemplateCreator.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/AbstractComponent.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/AbstractContainer.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/AbstractObjectList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/ApplicationPath.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/BebopComponentAdapter.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/CategoryComponent.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/Component.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/ComponentDispatcher.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/Container.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/GreetingItem.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/ObjectList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/QuickLinks.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/SimpleContainer.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/TemplateURLs.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/URLComponent.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategoryForm.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategoryFormAddContext.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategoryFormProcessListener.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategoryPanel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategorySelectionModel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/CategoryTree.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/QuickLinkForm.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/QuickLinkListing.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/admin/QuickLinkPanel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/AbstractTree.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Children.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Hierarchy.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Menu.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Path.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Root.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/Siblings.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/category/TopLevel.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/object/AtoZObjectList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/object/FilterObjectList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/object/SimpleObjectList.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletEditor.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ItemListPortletRenderer.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletEditor.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/ui/portlet/ObjectListPortletRenderer.java ccm-ldn-navigation/trunk/src/com/arsdigita/london/navigation/upgrades/Upgrade141to142.java ccm-ldn-navigation/trunk/test/src/com/arsdigita/london/navigation/NavigationSuite.java ccm-ldn-navigation/trunk/test/src/com/arsdigita/london/navigation/NavigationTestSetup.java ccm-ldn-navigation/trunk/test/src/com/arsdigita/london/navigation/RelatedItemsTest.java ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/PageLayout.pdl ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/WorkspacePage.pdl ccm-ldn-portal/trunk/pdl/com/arsdigita/london/portal/portlet/ContentDirectoryPortlet.pdl ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/Initializer.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/Loader.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/PageLayout.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/WorkspaceConfig.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/WorkspacePage.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/portlet/ContentDirectoryPortlet.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/portlet/WorkspaceDirectoryChannel.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/ApplicationPortlet.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/ApplicationSelector.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/LayoutForm.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PortalEditModelBuilder.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/PortalViewModelBuilder.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/WorkspaceDetails.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/ApplicationDetails.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/ApplicationList.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/ApplicationPane.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/CategoryComponent.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/GroupMemberDisplay.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/GroupMemberPicker.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/NewApplicationForm.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/SiteMapPane.java ccm-ldn-portal/trunk/src/com/arsdigita/london/portal/ui/admin/WorkspaceConfigFormSection.java ccm-ldn-rss/trunk/pdl/com/arsdigita/london/rss/RSS.pdl ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Initializer.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/Loader.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSS.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSChannel.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSConfig.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSFileResolver.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSImage.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSItem.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSItemCollection.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSRenderer.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/RSSService.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/SimpleRSSChannel.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/SimpleRSSImage.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/SimpleRSSItem.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/SimpleRSSItemCollection.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/category/CategoryChannel.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/category/CategoryPurposeChannel.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/dispatcher/RSSDispatcher.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/dispatcher/SimpleRSSDispatcher.java ccm-ldn-rss/trunk/src/com/arsdigita/london/rss/installer/Initializer.java ccm-ldn-search/trunk/pdl/com/arsdigita/london/search/Search.pdl ccm-ldn-search/trunk/src/com/arsdigita/london/search/HostFilterSpecification.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/HostFilterType.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/Initializer.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/Loader.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/Reindexer.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/RemoteQueryEngine.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/RemoteResultSet.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/RemoteSearcher.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/Search.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/SearchConfig.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/SearchGroup.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/SearchJob.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/SearchWorkerServlet.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/spider/SpiderConfig.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/AdvancedQueryComponent.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/AdvancedSearchPane.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/HostFilterWidget.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/RemoteQueryComponent.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/RemoteSearchPane.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SearchComponent.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SimpleQueryComponent.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SimpleSearchPane.java ccm-ldn-search/trunk/src/com/arsdigita/london/search/ui/SponsoredLinksComponent.java ccm-ldn-shortcuts/trunk/pdl/com/arsdigita/london/shortcuts/Shortcuts.pdl ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/Initializer.java ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/Loader.java ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutFilter.java ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/Shortcuts.java ccm-ldn-shortcuts/trunk/src/com/arsdigita/london/shortcuts/ShortcutsConfig.java ccm-ldn-subsite/trunk/pdl/com/arsdigita/london/subsite/Site.pdl ccm-ldn-subsite/trunk/pdl/com/arsdigita/london/subsite/Subsite.pdl ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/Initializer.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/Loader.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/Site.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/Subsite.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/SubsiteConfig.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/SubsiteContext.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/SubsiteFilter.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/SubsitePatternGenerator.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/dispatcher/SubsiteItemTemplateResolver.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/ui/ControlCenterPanel.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/ui/SiteForm.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/ui/SiteListing.java ccm-ldn-subsite/trunk/src/com/arsdigita/london/subsite/ui/SiteSelectionModel.java ccm-ldn-terms/trunk/pdl/com/arsdigita/london/terms/Domain.pdl ccm-ldn-terms/trunk/pdl/com/arsdigita/london/terms/Term.pdl ccm-ldn-terms/trunk/pdl/com/arsdigita/london/terms/Terms.pdl ccm-ldn-terms/trunk/pdl/com/arsdigita/london/terms/atoz/DomainProvider.pdl ccm-ldn-terms/trunk/pdl/com/arsdigita/london/terms/query-getTermItemCountSummary.pdl ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Domain.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/DomainUseContext.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Importer.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Initializer.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Loader.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/SetRoot.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Term.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/TermItemCountQuery.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/Terms.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/TermsConfig.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/atoz/DomainGenerator.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/atoz/DomainProvider.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/DomainBuilder.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/HierarchyBuilder.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/MixedHierarchyBuilder.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/Parser.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/RelatedBuilder.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/importer/TermItemBuilder.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/AbstractAssignedTerms.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/AbstractTermDetails.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/AbstractTermItemSummary.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/FlatCategoryPicker.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/RootCategoryPicker.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/AllTermListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/DomainContextForm.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/DomainDetails.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/DomainForm.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/DomainListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/DomainPanel.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/DomainUsage.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/NarrowerTermListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/OrphanedTermListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/RelatedTermListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/RootTermListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermDetails.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermFilteredListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermForm.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermListing.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermNameSearchForm.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermPanel.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/admin/TermPicker.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/atoz/DomainProviderAdmin.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/ui/atoz/DomainProviderForm.java ccm-ldn-terms/trunk/src/com/arsdigita/london/terms/upgrade/Upgrade100to101.java ccm-ldn-terms/trunk/test/src/com/arsdigita/london/terms/TermsSuite.java ccm-ldn-terms/trunk/test/src/com/arsdigita/london/terms/TermsTest.java ccm-ldn-terms/trunk/test/src/com/arsdigita/london/terms/TermsTestSetup.java ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/Theme.pdl ccm-ldn-theme/trunk/pdl/com/arsdigita/london/themes/ThemeFile.pdl ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/Initializer.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/Loader.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/Theme.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeApplication.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeCollection.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeConfig.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeConstants.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeDirectoryPatternGenerator.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeFile.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeFileCollection.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeObserver.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemePatternGenerator.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ThemeTransactionListener.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/dispatcher/ThemeDownloadServlet.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeContainer.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeControlPanel.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeFilesList.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeForm.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeListModelBuilder.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeSelectionModel.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeValidationPanel.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/ThemeXSLParameterGenerator.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/listeners/ApproveThemeActionListener.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/listeners/CancelListener.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/ui/listeners/LoggingErrorListener.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/util/GlobalizationUtil.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/util/ManifestReader.java ccm-ldn-theme/trunk/src/com/arsdigita/london/theme/util/TransformerExceptionContainer.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/AliasedClassParameter.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/Categorization.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ConfigPrinter.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/DomainObjectCopier.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/Initializer.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/Loader.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/Program.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ProgramErrorReport.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/Transaction.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/TransactionLocal.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/Util.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/cmd/BulkPublish.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/cmd/SiteMapList.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/ACSObjectInvariantCheck.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/Invariant.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantCheck.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantFactory.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantFactoryImpl.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantHandler.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantImpl.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/db/InvariantViolationException.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/devsupport/QueryLogger.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/AbstractCategoryPicker.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/AbstractDomainObjectComponent.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/AbstractDomainObjectDetails.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/AbstractDomainObjectList.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/ActionLink.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/ApplicationCategoryPicker.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/CategoryPicker.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/DomainObjectSelectionModel.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/ErrorMessage.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/ModalContainer.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/ObjectCategoryPicker.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/event/DomainObjectActionAbortedException.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/event/DomainObjectActionEvent.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/event/DomainObjectActionListener.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/parameters/DomainObjectParameter.java ccm-ldn-util/trunk/src/com/arsdigita/london/util/ui/parameters/URLParameter.java ccm-ldn-util/trunk/test/src/com/arsdigita/london/util/junit/BaseTestCase.java ccm-ldn-xmlfeed/trunk/src/com/arsdigita/cms/contenttypes/xmlfeed/Initializer.java ccm-ldn-xmlfeed/trunk/src/com/arsdigita/cms/contenttypes/xmlfeed/Loader.java ccm-ldn-xmlfeed/trunk/src/com/arsdigita/cms/contenttypes/xmlfeed/ui/XMLFeedProperties.java Log: Change all remaining instances of the CCMPL to LGPL Modified: ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/HTTPAuth.pdl =================================================================== --- ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/HTTPAuth.pdl 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/HTTPAuth.pdl 2004-11-11 23:58:35 UTC (rev 98) @@ -1,17 +1,19 @@ // -// Copyright (C) 2001, 2002 Red Hat Inc. All Rights Reserved. +// Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. // -// The contents of this file are subject to the CCM Public -// License (the "License"); you may not use this file except in -// compliance with the License. You may obtain a copy of -// the License at http://www.redhat.com/licenses/ccmpl.html -// -// Software distributed under the License is distributed on an "AS -// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -// implied. See the License for the specific language governing -// rights and limitations under the License. -// -// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; either version 2.1 of +// the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA model com.arsdigita.auth.http; Modified: ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/Nonce.pdl =================================================================== --- ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/Nonce.pdl 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/Nonce.pdl 2004-11-11 23:58:35 UTC (rev 98) @@ -1,17 +1,19 @@ // -// Copyright (C) 2001, 2002 Red Hat Inc. All Rights Reserved. +// Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. // -// The contents of this file are subject to the CCM Public -// License (the "License"); you may not use this file except in -// compliance with the License. You may obtain a copy of -// the License at http://www.redhat.com/licenses/ccmpl.html -// -// Software distributed under the License is distributed on an "AS -// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -// implied. See the License for the specific language governing -// rights and limitations under the License. -// -// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; either version 2.1 of +// the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA model com.arsdigita.auth.http; Modified: ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/UserLogin.pdl =================================================================== --- ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/UserLogin.pdl 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-auth-http/trunk/pdl/com/arsdigita/auth/http/UserLogin.pdl 2004-11-11 23:58:35 UTC (rev 98) @@ -1,17 +1,19 @@ // -// Copyright (C) 2001, 2002 Red Hat Inc. All Rights Reserved. +// Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. // -// The contents of this file are subject to the CCM Public -// License (the "License"); you may not use this file except in -// compliance with the License. You may obtain a copy of -// the License at http://www.redhat.com/licenses/ccmpl.html -// -// Software distributed under the License is distributed on an "AS -// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -// implied. See the License for the specific language governing -// rights and limitations under the License. -// -// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; either version 2.1 of +// the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA model com.arsdigita.auth.http; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuth.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuth.java 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuth.java 2004-11-11 23:58:35 UTC (rev 98) @@ -1,16 +1,19 @@ /* - * Copyright (C) 2001, 2002 Red Hat Inc. All Rights Reserved. + * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of - * the License at http://www.redhat.com/licenses/ccmpl.html - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package com.arsdigita.auth.http; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthConfig.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthConfig.java 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/HTTPAuthConfig.java 2004-11-11 23:58:35 UTC (rev 98) @@ -1,16 +1,19 @@ /* - * Copyright (C) 2001, 2002 Red Hat Inc. All Rights Reserved. + * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of - * the License at http://www.redhat.com/licenses/ccmpl.html - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package com.arsdigita.auth.http; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/Initializer.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/Initializer.java 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/Initializer.java 2004-11-11 23:58:35 UTC (rev 98) @@ -1,16 +1,19 @@ /* - * Copyright (C) 2001, 2002, 2003 Red Hat Inc. All Rights Reserved. + * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of - * the License at http://www.redhat.com/licenses/ccmpl.html - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package com.arsdigita.auth.http; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/Loader.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/Loader.java 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/Loader.java 2004-11-11 23:58:35 UTC (rev 98) @@ -1,16 +1,19 @@ /* - * Copyright (C) 2001, 2002, 2003 Red Hat Inc. All Rights Reserved. + * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of - * the License at http://www.redhat.com/licenses/ccmpl.html - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package com.arsdigita.auth.http; Modified: ccm-auth-http/trunk/src/com/arsdigita/auth/http/RedirectLoginModule.java =================================================================== --- ccm-auth-http/trunk/src/com/arsdigita/auth/http/RedirectLoginModule.java 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-auth-http/trunk/src/com/arsdigita/auth/http/RedirectLoginModule.java 2004-11-11 23:58:35 UTC (rev 98) @@ -1,16 +1,19 @@ /* - * Copyright (C) 2001, 2002 Red Hat Inc. All Rights Reserved. + * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of - * the License at http://www.redhat.com/licenses/ccmpl.html - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package com.arsdigita.auth.http; Modified: ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/PublishedHTMLProvider.java =================================================================== --- ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/PublishedHTMLProvider.java 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-cms/trunk/src/com/arsdigita/cms/publishToFile/PublishedHTMLProvider.java 2004-11-11 23:58:35 UTC (rev 98) @@ -1,36 +1,23 @@ /* - * Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. + * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License * as published by the Free Software Foundation; either version 2.1 of * the License, or (at your option) any later version. - * + * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. - * + * * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ + package com.arsdigita.cms.publishToFile; -/* - * Copyright (C) 2001, 2002, 2003 Red Hat Inc. All Rights Reserved. - * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of - * the License at http://www.redhat.com/licenses/ccmpl.html - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - */ + interface PublishedHTMLProvider { public RetrievedFile fetchHTML(String urlSource); } Modified: ccm-cms-types-address/trunk/sql/ccm-cms-types-address/default/upgrade/address-upgrade-1.sql =================================================================== --- ccm-cms-types-address/trunk/sql/ccm-cms-types-address/default/upgrade/address-upgrade-1.sql 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-cms-types-address/trunk/sql/ccm-cms-types-address/default/upgrade/address-upgrade-1.sql 2004-11-11 23:58:35 UTC (rev 98) @@ -1,16 +1,17 @@ -- --- Copyright (C) 2003-2004 Red Hat Inc. All Rights Reserved. +-- Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. -- --- The contents of this file are subject to the CCM Public --- License (the "License"); you may not use this file except in --- compliance with the License. You may obtain a copy of the --- License at http://www.redhat.com/licenses/ccmpl.html. --- --- Software distributed under the License is distributed on an --- "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express --- or implied. See the License for the specific language governing --- rights and limitations under the License. --- --- $Id: //cms/content-types/address/dev/sql/ccm-cms-types-address/default/upgrade/address-upgrade-1.sql#3 $ --- $DateTime: 2004/04/07 16:07:11 $ -alter table ct_addresses add uri VARCHAR(250); \ No newline at end of file +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +alter table ct_addresses add uri VARCHAR(250); Modified: ccm-cms-types-esdservice/trunk/pdl/com/arsdigita/content-types/ESDService.pdl =================================================================== --- ccm-cms-types-esdservice/trunk/pdl/com/arsdigita/content-types/ESDService.pdl 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-cms-types-esdservice/trunk/pdl/com/arsdigita/content-types/ESDService.pdl 2004-11-11 23:58:35 UTC (rev 98) @@ -1,19 +1,20 @@ // -// Copyright (C) 2004 Red Hat Inc. All Rights Reserved. +// Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. // -// The contents of this file are subject to the CCM Public -// License (the "License"); you may not use this file except in -// compliance with the License. You may obtain a copy of -// the License at http://www.redhat.com/licenses/ccmpl.html -// -// Software distributed under the License is distributed on an "AS -// IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -// implied. See the License for the specific language governing -// rights and limitations under the License. -// -// $Id: //ps/apps/london/esdservice/dev/pdl/com/arsdigita/content-types/ESDService.pdl#2 $ -// $DateTiem: $ - +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public License +// as published by the Free Software Foundation; either version 2.1 of +// the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + model com.arsdigita.cms.contenttypes; import com.arsdigita.cms.TextPage; Modified: ccm-cms-types-esdservice/trunk/sql/ccm-cms-types-esdservice/oracle-se-create.sql =================================================================== --- ccm-cms-types-esdservice/trunk/sql/ccm-cms-types-esdservice/oracle-se-create.sql 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-cms-types-esdservice/trunk/sql/ccm-cms-types-esdservice/oracle-se-create.sql 2004-11-11 23:58:35 UTC (rev 98) @@ -1,18 +1,19 @@ -- --- Copyright (C) 2004 Red Hat Inc. All Rights Reserved. +-- Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. -- --- The contents of this file are subject to the CCM Public --- License (the "License"); you may not use this file except in --- compliance with the License. You may obtain a copy of --- the License at http://www.redhat.com/licenses/ccmpl.html --- --- Software distributed under the License is distributed on an "AS --- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or --- implied. See the License for the specific language governing --- rights and limitations under the License. --- --- $Id: //ps/apps/london/esdservice/dev/sql/ccm-cms-types-esdservice/oracle-se-create.sql#1 $ --- $DateTime: 2004/01/27 17:07:09 $ +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ ddl/oracle-se/create.sql @@ ddl/oracle-se/deferred.sql Modified: ccm-cms-types-esdservice/trunk/sql/ccm-cms-types-esdservice/postgres-create.sql =================================================================== --- ccm-cms-types-esdservice/trunk/sql/ccm-cms-types-esdservice/postgres-create.sql 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-cms-types-esdservice/trunk/sql/ccm-cms-types-esdservice/postgres-create.sql 2004-11-11 23:58:35 UTC (rev 98) @@ -1,18 +1,19 @@ -- --- Copyright (C) 2004 Red Hat Inc. All Rights Reserved. +-- Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. -- --- The contents of this file are subject to the CCM Public --- License (the "License"); you may not use this file except in --- compliance with the License. You may obtain a copy of --- the License at http://www.redhat.com/licenses/ccmpl.html --- --- Software distributed under the License is distributed on an "AS --- IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or --- implied. See the License for the specific language governing --- rights and limitations under the License. --- --- $Id: //ps/apps/london/esdservice/dev/sql/ccm-cms-types-esdservice/postgres-create.sql#1 $ --- $DateTime: 2004/01/27 17:07:09 $ +-- This library is free software; you can redistribute it and/or +-- modify it under the terms of the GNU Lesser General Public License +-- as published by the Free Software Foundation; either version 2.1 of +-- the License, or (at your option) any later version. +-- +-- This library is distributed in the hope that it will be useful, +-- but WITHOUT ANY WARRANTY; without even the implied warranty of +-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-- Lesser General Public License for more details. +-- +-- You should have received a copy of the GNU Lesser General Public +-- License along with this library; if not, write to the Free Software +-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA \i ddl/postgres/create.sql \i ddl/postgres/deferred.sql Modified: ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ESDService.java =================================================================== --- ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ESDService.java 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ESDService.java 2004-11-11 23:58:35 UTC (rev 98) @@ -1,18 +1,19 @@ /* - * Copyright (C) 2004 Red Hat Inc. All Rights Reserved. + * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of - * the License at http://www.redhat.com/licenses/ccmpl.html - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Created on Jan 26, 2004 - * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ package com.arsdigita.cms.contenttypes; Modified: ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ESDServiceInitializer.java =================================================================== --- ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ESDServiceInitializer.java 2004-11-11 21:46:19 UTC (rev 97) +++ ccm-cms-types-esdservice/trunk/src/com/arsdigita/cms/contenttypes/ESDServiceInitializer.java 2004-11-11 23:58:35 UTC (rev 98) @@ -1,18 +1,19 @@ /* - * Copyright (C) 2004 Red Hat Inc. All Rights Reserved. + * Copyright (C) 2001-2004 Red Hat Inc. All Rights Reserved. * - * The contents of this file are subject to the CCM Public - * License (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of - * the License at http://www.redhat.com/licenses/ccmpl.html - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * Created on Jan 26, 2004 - * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warrant... [truncated message content] |
|
From: <mb...@re...> - 2004-11-11 21:53:30
|
Author: mbooth Date: 2004-11-11 22:46:19 +0100 (Thu, 11 Nov 2004) New Revision: 97 Modified: users/mbooth/projects/aplaws/svn-checkout.sh Log: Add user preferences Modified: users/mbooth/projects/aplaws/svn-checkout.sh =================================================================== --- users/mbooth/projects/aplaws/svn-checkout.sh 2004-11-11 21:44:25 UTC (rev 96) +++ users/mbooth/projects/aplaws/svn-checkout.sh 2004-11-11 21:46:19 UTC (rev 97) @@ -47,3 +47,4 @@ svn checkout http://aplaws.redhat.com/svn/aplaws/ccm-ldn-util/trunk ccm-ldn-util/ svn checkout http://aplaws.redhat.com/svn/aplaws/ccm-ldn-xmlfeed/trunk ccm-ldn-xmlfeed/ svn checkout http://aplaws.redhat.com/svn/aplaws/ccm-simplesurvey/trunk ccm-simplesurvey/ +svn co http://aplaws.redhat.com/svn/aplaws/ccm-user-preferences/trunk/ ccm-user-preferences |
Author: mbooth Date: 2004-11-11 22:44:25 +0100 (Thu, 11 Nov 2004) New Revision: 96 Added: ccm-user-preferences/ ccm-user-preferences/trunk/ ccm-user-preferences/trunk/application.xml ccm-user-preferences/trunk/etc/ ccm-user-preferences/trunk/pdl/ ccm-user-preferences/trunk/pdl/com/ ccm-user-preferences/trunk/pdl/com/arsdigita/ ccm-user-preferences/trunk/pdl/com/arsdigita/london/ ccm-user-preferences/trunk/pdl/com/arsdigita/london/userprefs/ ccm-user-preferences/trunk/pdl/com/arsdigita/london/userprefs/UserPrefs.pdl ccm-user-preferences/trunk/sql/ ccm-user-preferences/trunk/sql/ccm-user-preferences/ ccm-user-preferences/trunk/sql/ccm-user-preferences/oracle-se-create.sql ccm-user-preferences/trunk/sql/ccm-user-preferences/postgres-create.sql ccm-user-preferences/trunk/src/ ccm-user-preferences/trunk/src/ccm-user-preferences.config ccm-user-preferences/trunk/src/ccm-user-preferences.load ccm-user-preferences/trunk/src/com/ ccm-user-preferences/trunk/src/com/arsdigita/ ccm-user-preferences/trunk/src/com/arsdigita/london/ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/Initializer.java ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/PersistentUserPrefs.java ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/Pref.java ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefsSessionListener.java ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ui/ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ui/UserPrefsComponent.java Log: Initial import Added: ccm-user-preferences/trunk/application.xml =================================================================== --- ccm-user-preferences/trunk/application.xml 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/application.xml 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> + +<ccm:application name="ccm-user-preferences" + prettyName="User Preferences" + version="1.0.0" + release="1" + xmlns:ccm="http://ccm.redhat.com/ccm-project"> + + <ccm:dependencies> + <ccm:requires name="ccm-core" version="6.1.0"/> + </ccm:dependencies> + + <ccm:contacts> + <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/> + <ccm:contact uri="mailto:rh...@re..." type="support"/> + </ccm:contacts> + + <ccm:description> + The Red Hat Web Application Framework is a platform for writing + database-backed web applications in Java. + </ccm:description> + +</ccm:application> Added: ccm-user-preferences/trunk/pdl/com/arsdigita/london/userprefs/UserPrefs.pdl =================================================================== --- ccm-user-preferences/trunk/pdl/com/arsdigita/london/userprefs/UserPrefs.pdl 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/pdl/com/arsdigita/london/userprefs/UserPrefs.pdl 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,37 @@ +// +//This library is free software; you can redistribute it and/or +//modify it under the terms of the GNU Lesser General Public License +//as published by the Free Software Foundation; either version 2.1 of +//the License, or (at your option) any later version. +// +//This library is distributed in the hope that it will be useful, +//but WITHOUT ANY WARRANTY; without even the implied warranty of +//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +//Lesser General Public License for more details. +// +//You should have received a copy of the GNU Lesser General Public +//License along with this library; if not, write to the Free Software +//Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +model com.arsdigita.london.userprefs; + +import com.arsdigita.kernel.User; + +object type PersistentUserPrefs { + BigDecimal[1..1] id = user_prefs.id; + + unique User[0..1] user = join user_prefs.user_id to users.user_id; + unique Long[0..1] cookie = user_prefs.cookie; + component Pref[0..n] prefs = join user_prefs.id to user_pref.prefs_id; + + object key ( id ); +} + +object type Pref { + BigDecimal[1..1] id = user_pref.id; + + String[1..1] key = user_pref.key; + String[0..1] value = user_pref.value; + + object key ( id ); +} Added: ccm-user-preferences/trunk/sql/ccm-user-preferences/oracle-se-create.sql =================================================================== --- ccm-user-preferences/trunk/sql/ccm-user-preferences/oracle-se-create.sql 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/sql/ccm-user-preferences/oracle-se-create.sql 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,3 @@ +@ ddl/oracle-se/create.sql +@ ddl/oracle-se/deferred.sql + Added: ccm-user-preferences/trunk/sql/ccm-user-preferences/postgres-create.sql =================================================================== --- ccm-user-preferences/trunk/sql/ccm-user-preferences/postgres-create.sql 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/sql/ccm-user-preferences/postgres-create.sql 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,4 @@ +begin; +\i ddl/postgres/create.sql +\i ddl/postgres/deferred.sql +end; Added: ccm-user-preferences/trunk/src/ccm-user-preferences.config =================================================================== --- ccm-user-preferences/trunk/src/ccm-user-preferences.config 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/src/ccm-user-preferences.config 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<registry> + <config class="com.arsdigita.london.atoz.AtoZConfig" + storage="ccm-ldn-atoz/atoz.properties"/> +</registry> Added: ccm-user-preferences/trunk/src/ccm-user-preferences.load =================================================================== --- ccm-user-preferences/trunk/src/ccm-user-preferences.load 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/src/ccm-user-preferences.load 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,18 @@ +<load> + <requires> + <table name="inits"/> + <table name="acs_objects"/> + <initializer class="com.arsdigita.core.Initializer"/> + </requires> + <provides> + <table name="user_prefs"/> + <table name="user_pref"/> + <initializer class="com.arsdigita.london.userprefs.Initializer"/> + </provides> + <scripts> + <schema directory="ccm-user-preferences"/> + <!-- + <data class="com.arsdigita.london.userprefs.Loader"/> + --> + </scripts> +</load> Added: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/Initializer.java =================================================================== --- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/Initializer.java 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/Initializer.java 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,47 @@ +/* +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public License +as published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +package com.arsdigita.london.userprefs; + +import com.arsdigita.db.DbHelper; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.ManifestSource; +import com.arsdigita.persistence.pdl.NameFilter; +import com.arsdigita.runtime.CompoundInitializer; +import com.arsdigita.runtime.DomainInitEvent; +import com.arsdigita.runtime.PDLInitializer; +import com.arsdigita.runtime.RuntimeConfig; + +/** + * Initializes the user preferences system + * @version $Id$ + */ +public class Initializer extends CompoundInitializer { + public Initializer() { + final String url = RuntimeConfig.getConfig().getJDBCURL(); + final int database = DbHelper.getDatabaseFromURL(url); + + add(new PDLInitializer + (new ManifestSource + ("ccm-user-preferences.pdl.mf", + new NameFilter(DbHelper.getDatabaseSuffix(database), "pdl")))); + } + + public void init( DomainInitEvent evt ) { + PersistentUserPrefs.domainInit(); + Pref.domainInit(); + } +} Added: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/PersistentUserPrefs.java =================================================================== --- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/PersistentUserPrefs.java 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/PersistentUserPrefs.java 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,229 @@ +/* +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public License +as published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +package com.arsdigita.london.userprefs; + +import com.arsdigita.db.Sequences; +import com.arsdigita.domain.DomainCollection; +import com.arsdigita.domain.DomainObject; +import com.arsdigita.domain.DomainObjectFactory; +import com.arsdigita.domain.DomainObjectInstantiator; +import com.arsdigita.kernel.User; +import com.arsdigita.persistence.DataAssociation; +import com.arsdigita.persistence.DataCollection; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.util.UncheckedWrapperException; + +import java.sql.SQLException; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; + +import org.apache.log4j.Logger; + +public class PersistentUserPrefs extends DomainObject { + private static final Logger s_log = + Logger.getLogger( PersistentUserPrefs.class ); + + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.london.userprefs.PersistentUserPrefs"; + + public static final String ID = "id"; + public static final String USER = "user"; + public static final String PREFS = "prefs"; + public static final String COOKIE = "cookie"; + + PersistentUserPrefs() { + super( BASE_DATA_OBJECT_TYPE ); + + try { + set( ID, Sequences.getNextValue() ); + } catch( SQLException ex ) { + throw new UncheckedWrapperException( ex ); + } + } + + public PersistentUserPrefs( OID oid ) { + super( oid ); + } + + public PersistentUserPrefs( DataObject obj ) { + super( obj ); + } + + static void domainInit() { + DomainObjectFactory.registerInstantiator( + BASE_DATA_OBJECT_TYPE, + new DomainObjectInstantiator() { + protected DomainObject doNewInstance( DataObject obj ) { + return new PersistentUserPrefs( obj ); + } + } + ); + } + + static PersistentUserPrefs retrieveForUser( User user ) { + DataCollection pups = SessionManager.getSession().retrieve + ( BASE_DATA_OBJECT_TYPE ); + pups.addEqualsFilter( USER + "." + User.ID, user.getID() ); + + PersistentUserPrefs prefs = null; + if( pups.next() ) { + prefs = new PersistentUserPrefs( pups.getDataObject() ); + s_log.warn( "User " + user.getOID() + " has multiple user " + + "preferences" ); + } + pups.close(); + + return prefs; + } + + static PersistentUserPrefs retrieveForCookie( Long cookie ) { + DataCollection pups = SessionManager.getSession().retrieve + ( BASE_DATA_OBJECT_TYPE ); + pups.addEqualsFilter( COOKIE, cookie ); + + PersistentUserPrefs prefs = null; + if( pups.next() ) { + prefs = new PersistentUserPrefs( pups.getDataObject() ); + if( pups.next() ) { + s_log.warn( "Cookie " + cookie + " has multiple user " + + "preferences" ); + } + } + pups.close(); + + return prefs; + } + + public String getValue( String key ) { + DomainCollection prefs = getAllValues(); + prefs.addEqualsFilter( Pref.KEY, key ); + + String value = null; + if( prefs.next() ) { + value = (String) prefs.get( Pref.VALUE ); + + if( prefs.next() ) { + s_log.warn( "Users prefs " + getOID() + " has multiple " + + "values for " + key ); + } + } + prefs.close(); + + return value; + } + + public DomainCollection getAllValues() { + DataAssociation prefs = (DataAssociation) get( PREFS ); + return new DomainCollection( prefs.getDataAssociationCursor() ); + } + + public void removeValue( String key ) { + DomainCollection prefs = getAllValues(); + prefs.addEqualsFilter( Pref.KEY, key ); + + while( prefs.next() ) { + prefs.getDomainObject().delete(); + } + } + + public void setValue( String key, String value ) { + DomainCollection prefs = getAllValues(); + prefs.addEqualsFilter( Pref.KEY, key ); + + Pref pref; + if( prefs.next() ) { + pref = (Pref) prefs.getDomainObject(); + + if( prefs.next() ) { + s_log.warn( "Users prefs " + getOID() + " has multiple " + + "values for " + key ); + } + } else { + pref = new Pref(); + pref.setKey( key ); + } + prefs.close(); + + pref.setValue( value ); + if( pref.isNew() ) { + add( PREFS, pref ); + } + } + + public void setAllValues( Map newPrefs ) { + if( newPrefs.isEmpty() ) { + s_log.debug( "All values removed. Deleting prefs object." ); + delete(); + return; + } + + s_log.debug( "Setting all values" ); + + HashSet newKeys = new HashSet( newPrefs.keySet() ); + DomainCollection prefs = getAllValues(); + + while( prefs.next() ) { + String key = (String) prefs.get( Pref.KEY ); + String value = (String) prefs.get( Pref.VALUE ); + + if( !newKeys.contains( key ) ) { + prefs.getDomainObject().delete(); + } + + else { + String newValue = (String) newPrefs.get( key ); + if( !value.equals( newValue ) ) { + Pref pref = (Pref) prefs.getDomainObject(); + pref.setValue( newValue ); + } + + newKeys.remove( key ); + } + } + + Iterator i = newKeys.iterator(); + while( i.hasNext() ) { + String key = (String) i.next(); + + Pref pref = new Pref(); + pref.setKey( key ); + pref.setValue( (String) newPrefs.get( key ) ); + + add( PREFS, pref ); + } + } + + void setUser( User user ) { + setAssociation( USER, user ); + } + + User getUser() { + return (User) DomainObjectFactory.newInstance + ( (DataObject) get( USER ) ); + } + + void setCookie( Long cookie ) { + set( COOKIE, cookie ); + } + + Long getCookie() { + return (Long) get( COOKIE ); + } +} Added: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/Pref.java =================================================================== --- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/Pref.java 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/Pref.java 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,85 @@ +/* +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public License +as published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +package com.arsdigita.london.userprefs; + +import com.arsdigita.db.Sequences; +import com.arsdigita.domain.DomainObject; +import com.arsdigita.domain.DomainObjectFactory; +import com.arsdigita.domain.DomainObjectInstantiator; +import com.arsdigita.persistence.DataObject; +import com.arsdigita.persistence.OID; +import com.arsdigita.util.UncheckedWrapperException; + +import java.sql.SQLException; + +import org.apache.log4j.Logger; + +public class Pref extends DomainObject { + private static final Logger s_log = Logger.getLogger( Pref.class ); + + public static final String ID = "id"; + public static final String KEY = "key"; + public static final String VALUE = "value"; + + public static final String BASE_DATA_OBJECT_TYPE = + "com.arsdigita.london.userprefs.Pref"; + + Pref() { + super( BASE_DATA_OBJECT_TYPE ); + + try { + set( ID, Sequences.getNextValue() ); + } catch( SQLException ex ) { + throw new UncheckedWrapperException( ex ); + } + } + + public Pref( OID oid ) { + super( oid ); + } + + public Pref( DataObject obj ) { + super( obj ); + } + + static void domainInit() { + DomainObjectFactory.registerInstantiator( + BASE_DATA_OBJECT_TYPE, + new DomainObjectInstantiator() { + protected DomainObject doNewInstance( DataObject obj ) { + return new Pref( obj ); + } + } + ); + } + + public String getKey() { + return get( KEY ).toString(); + } + + void setKey( String key ) { + set( KEY, key ); + } + + public String getValue() { + return get( VALUE ).toString(); + } + + void setValue( String value ) { + set( VALUE, value ); + } +} Added: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java =================================================================== --- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefs.java 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,378 @@ +/* +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public License +as published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +package com.arsdigita.london.userprefs; + +import com.arsdigita.domain.DataObjectNotFoundException; +import com.arsdigita.domain.DomainCollection; +import com.arsdigita.kernel.Kernel; +import com.arsdigita.kernel.User; +import com.arsdigita.persistence.OID; +import com.arsdigita.persistence.SessionManager; +import com.arsdigita.persistence.TransactionContext; +import com.arsdigita.util.UncheckedWrapperException; + +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Random; + +import javax.servlet.http.Cookie; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionActivationListener; + +import org.apache.log4j.Logger; + +/** + * <p>User Preferences. An object for storing user preferences in the current + * session.</p> + * + * <p>This object is an abstraction of PersistentUserPreferences, which is a + * <code>DomainObject</code> stored in the database. <code>UserPrefs</code> is + * cached in the java Session and will not touch the database on every + * request.</p> + * + * <p>If the current user is not logged in, <code>UserPrefs</code> will use its + * own cookie. This means that preferences can be saved even when a user doesn't + * log in.</p> + * + * @author Matthew Booth <mb...@re...> + */ + +// LAZY PERSISTENCE + +// My original intention was that save would not save immediately, but rather +// only save when the session expires. This is not terribly safe for the data, +// but these are only user preferences and I didn't want to unnecessarily hit +// the database. As long as data is not usually lost, that's fine. + +// I was originally going to achieve this by implementing +// HttpSessionBindingListener in the understanding that objects would be unbound +// before the session is destroyed. They're not. Instead I tried +// HttpSessionActivationListener which is called when a Session is migrated +// between servers. This isn't used either, but I left that in because it +// seems like a good idea. + +// Finally I tried HttpSessionListener. It looks like I should have tried this +// first, as it appears to be the correct interface for the job. However, the +// sessionDestroyed() method is only called *after* the Session object is +// invalidated. This means that not only can you not retrieve attributes from +// it, but you can't even get the session ID. You know that a session was just +// destroyed, but you have no way of knowing which one. In fact, it's utterly, +// utterly, utterly useless. It's completely without merit. A waste of bits. +// Who on earth came up with that? + +// There seems to be some talk of this being fixed in the Servlet 2.4 spec. + +// Matt <mb...@re...> + +public class UserPrefs implements HttpSessionActivationListener { + private static final Logger s_log = Logger.getLogger( UserPrefs.class ); + + private static final String COOKIE = "WAF_USER_PREFS"; + static final String SESSION_ATTRIBUTE = UserPrefs.class.getName(); + + private OID m_user = null; + private OID m_persistentPrefs = null; + private Long m_cookie = null; + + private HashMap m_prefs = new HashMap(); + + private UserPrefs() {}; + + private UserPrefs( PersistentUserPrefs persistentPrefs ) { + m_persistentPrefs = persistentPrefs.getOID(); + m_cookie = persistentPrefs.getCookie(); + m_user = persistentPrefs.getUser() == null ? + null : persistentPrefs.getUser().getOID(); + + DomainCollection prefs = persistentPrefs.getAllValues(); + while( prefs.next() ) { + Pref pref = (Pref) prefs.getDomainObject(); + m_prefs.put( pref.getKey(), pref.getValue() ); + } + } + + /** + * <p>Retrieve a UserPrefs object for the current request.</p> + * + * <p>In order, this will: + * + * <ul> + * <li>Look for prefs in the http session</li> + * <li>Look for prefs for the currently logged in user</li> + * <li>Look for prefs for a supplied cookie (from DB)</li> + * <li>Create a new preferences object</li> + * </ul> + * </p> + */ + public static UserPrefs retrieve( HttpServletRequest req, + HttpServletResponse res ) { + UserPrefs prefs = (UserPrefs) + req.getSession().getAttribute( SESSION_ATTRIBUTE ); + + if( null != prefs ) return prefs; + + User user = (User) Kernel.getContext().getParty(); + if( null != user ) { + PersistentUserPrefs persistentPrefs = + PersistentUserPrefs.retrieveForUser( user ); + if( null != persistentPrefs ) { + prefs = new UserPrefs( persistentPrefs ); + } + } + + if( null != prefs ) { + s_log.debug( "Got prefs for user" ); + req.getSession().setAttribute( SESSION_ATTRIBUTE, prefs ); + return prefs; + } + + Long cookie = getCookie( req ); + if( null != cookie ) { + PersistentUserPrefs persistentPrefs = + PersistentUserPrefs.retrieveForCookie( cookie ); + + // Remove a bogus cookie + if( null == persistentPrefs ) { + removeCookie( res ); + } + + else { + prefs = new UserPrefs( persistentPrefs ); + } + } + + if( null != prefs ) { + s_log.debug( "Got prefs for cookie" ); + req.getSession().setAttribute( SESSION_ATTRIBUTE, prefs ); + return prefs; + } + + prefs = new UserPrefs(); + + if( null != user ) { + prefs.m_user = user.getOID(); + } else { + try { + SecureRandom random = SecureRandom.getInstance( "SHA1PRNG" ); + cookie = new Long( random.nextLong() ); + } catch( NoSuchAlgorithmException ex ) { + s_log.warn( "Unable to get SecureRandom for SHA1PRNG. " + + "Falling back to insecure random generator." ); + cookie = new Long( new Random().nextLong() ); + } + + prefs.m_cookie = cookie; + setCookie( res, cookie.toString() ); + } + + s_log.debug( "Created new prefs" ); + req.getSession().setAttribute( SESSION_ATTRIBUTE, prefs ); + return prefs; + } + + /** + * Retrieve the value of a user preference entry. + * + * @param key The identifier of the preference to be retrieved + * @return The value of the requsted preference, or null if it is not set + */ + public String get( String key ) { + return (String) m_prefs.get( key ); + } + + /** + * Retrieve all stored user preferences. + * + * @return An Iterator of Map.Entry objects containing key/value pairs for + * the user's current preferences + */ + public Iterator getAll() { + return m_prefs.entrySet().iterator(); + } + + /** + * Set a preference. This will not cause the preference to be immediately + * persisted. + * + * <p><strong>NB: Lazy persistence is not currently working, so this will + * persist immediately for the time being.</strong></p> + * + * @param key The identifier of the preference to be stored + * @param value The value of the preference to be stored + */ + public void set( String key, String value ) { + m_prefs.put( key, value ); + + // XXX: remove the line below when lazy persistence works + getPersistent().setValue( key, value ); + } + + /** + * Set a preference. Optionally save the preference immediately. + * + * <p><strong>NB: Lazy persistence is not currently working, so this will + * persist immediately for the time being.</strong></p> + * + * @param key The identifier of the preference to be stored + * @param value The value of the preference to be stored + * @param persist true if the value is to be immediately saved + */ + public void set( String key, String value, boolean persist ) { + set( key, value ); + + //if( persist ) { + getPersistent().setValue( key, value ); + //} + } + + /** + * Remove a user preference. This change will not be saved immediately. + * + * @param key The identifier of the preference to be removed + */ + public void remove( String key ) { + m_prefs.remove( key ); + } + + /** + * Remove a user preference. Optionally save this change immediately. + * + * <p><strong>NB: Lazy persistence is not currently working, so this will + * persist immediately for the time being.</strong></p> + * + * @param key The identifier of the preference to be removed + * @param persist true if the change is to be immediately saved + */ + public void remove( String key, boolean persist ) { + remove( key ); + + if( persist ) { + getPersistent().removeValue( key ); + } + } + + /** + * Save user preferences to the database + */ + public void persist() { + s_log.info( "Persisting session" ); + + PersistentUserPrefs prefs = getPersistent(); + prefs.setAllValues( m_prefs ); + prefs.save(); + + s_log.debug( "Session persisted" ); + } + + public void sessionDidActivate(HttpSessionEvent event) { + // Not interested in this event + s_log.debug( "Session activated" ); + } + + public void sessionWillPassivate(HttpSessionEvent event) { + s_log.debug( "Session about to be passivated" ); + persist(); + } + + /** + * Get a PersistentUserPrefs object. Create one if necessary. + */ + private PersistentUserPrefs getPersistent() { + PersistentUserPrefs prefs; + + if( null == m_persistentPrefs ) { + prefs = new PersistentUserPrefs(); + } else { + try { + prefs = new PersistentUserPrefs( m_persistentPrefs ); + } catch( DataObjectNotFoundException ex ) { + s_log.warn( "User preferences object contained bogus " + + "persistent preferences OID" ); + prefs = new PersistentUserPrefs(); + } + } + + // If this is newly persisted, set appropriately + if( prefs.isNew() ) { + if( s_log.isDebugEnabled() ) { + s_log.debug( "Initializing new user preferences: " + + prefs.getOID() ); + } + + if( null != m_user ) { + prefs.setUser( new User( m_user ) ); + } + + else if( null != m_cookie ) { + prefs.setCookie( m_cookie ); + } + + else { + throw new UncheckedWrapperException ( "User preferences object doesn't contain either a user or a cookie object" ); + } + } + + // If we're saving something and we have a user object now, use that + // in preference + if( null == m_user ) { + User user = (User) Kernel.getContext().getParty(); + if( null != user ) { + prefs.setUser( user ); + prefs.setCookie( null ); + } + } + + m_persistentPrefs = prefs.getOID(); + + return prefs; + } + + private static Long getCookie( HttpServletRequest req ) { + Cookie[] cookieJar = req.getCookies(); + if( null == cookieJar ) return null; + + for( int i = 0; i < cookieJar.length; i++ ) { + if( COOKIE.equals( cookieJar[i].getName() ) ) { + try { + return Long.valueOf( cookieJar[i].getValue() ); + } catch( NumberFormatException ex ) { + s_log.warn( "Bogus cookie value: " + + cookieJar[i].getValue() ); + // Might as well keep looking + } + } + } + + return null; + } + + private static void setCookie( HttpServletResponse res, String value ) { + Cookie cookie = new Cookie( COOKIE, value ); + cookie.setMaxAge( Integer.MAX_VALUE ); + res.addCookie( cookie ); + } + + private static void removeCookie( HttpServletResponse res ) { + Cookie cookie = new Cookie( COOKIE, "" ); + cookie.setMaxAge( 0 ); + res.addCookie( cookie ); + } +} Added: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefsSessionListener.java =================================================================== --- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefsSessionListener.java 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/UserPrefsSessionListener.java 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,46 @@ +/* +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public License +as published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +package com.arsdigita.london.userprefs; + +import javax.servlet.http.HttpSession; +import javax.servlet.http.HttpSessionEvent; +import javax.servlet.http.HttpSessionListener; + +import org.apache.log4j.Logger; + +public class UserPrefsSessionListener implements HttpSessionListener { + private static final Logger s_log = + Logger.getLogger( UserPrefsSessionListener.class ); + + public void sessionCreated( HttpSessionEvent se ) { + s_log.debug( "Session created" ); + } + + public void sessionDestroyed( HttpSessionEvent se ) { + s_log.debug( "Session destroyed" ); + + HttpSession session = se.getSession(); + + try { + UserPrefs prefs = (UserPrefs) session.getAttribute + ( UserPrefs.SESSION_ATTRIBUTE ); + prefs.persist(); + } catch( Throwable t ) { + s_log.error( t ); + } + } +} Added: ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ui/UserPrefsComponent.java =================================================================== --- ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ui/UserPrefsComponent.java 2004-11-11 20:15:31 UTC (rev 95) +++ ccm-user-preferences/trunk/src/com/arsdigita/london/userprefs/ui/UserPrefsComponent.java 2004-11-11 21:44:25 UTC (rev 96) @@ -0,0 +1,110 @@ +/* +This library is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public License +as published by the Free Software Foundation; either version 2.1 of +the License, or (at your option) any later version. + +This library is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with this library; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +package com.arsdigita.london.userprefs.ui; + +import com.arsdigita.london.userprefs.UserPrefs; + +import com.arsdigita.bebop.Page; +import com.arsdigita.bebop.PageState; +import com.arsdigita.bebop.SimpleComponent; +import com.arsdigita.bebop.event.RequestEvent; +import com.arsdigita.bebop.event.RequestListener; +import com.arsdigita.bebop.parameters.BooleanParameter; +import com.arsdigita.bebop.parameters.StringParameter; +import com.arsdigita.xml.Element; + +import java.util.Iterator; +import java.util.Map; + +import org.apache.log4j.Logger; + +public class UserPrefsComponent extends SimpleComponent { + private static final Logger s_log = + Logger.getLogger( UserPrefsComponent.class ); + + public static final String XMLNS = "http://xmlns.redhat.com/userprefs/1.0"; + + public UserPrefsComponent() { + super(); + } + + private StringParameter m_setKey = new StringParameter( "pref.set.key" ); + private StringParameter m_setValue = new StringParameter( "pref.set.value" ); + private StringParameter m_remove = new StringParameter( "pref.remove" ); + private BooleanParameter m_immediate = new BooleanParameter( "pref.immediate" ); + + public void generateXML( PageState ps, Element parent ) { + UserPrefs prefs = UserPrefs.retrieve( ps.getRequest(), + ps.getResponse() ); + + Element rootE = parent.newChildElement( "up:userPreferences", XMLNS ); + + Iterator values = prefs.getAll(); + while( values.hasNext() ) { + Map.Entry pref = (Map.Entry) values.next(); + + String key = (String) pref.getKey(); + String value = (String) pref.getValue(); + + Element prefE = rootE.newChildElement( "up:preference", XMLNS ); + prefE.addAttribute( "key", key ); + + if( null != value ) { + prefE.addAttribute( "value", value ); + } + } + } + + public void register( Page p ) { + super.register( p ); + + p.addGlobalStateParam( m_setKey ); + p.addGlobalStateParam( m_setValue ); + p.addGlobalStateParam( m_remove ); + p.addGlobalStateParam( m_immediate ); + + p.addRequestListener( new RequestListener() { + public void pageRequested( RequestEvent ev ) { + PageState ps = ev.getPageState(); + + String setKey = (String) ps.getValue( m_setKey ); + String setValue = (String) ps.getValue( m_setValue ); + String remove = (String) ps.getValue( m_remove ); + Boolean immediate = (Boolean) ps.getValue( m_immediate ); + + UserPrefs prefs = UserPrefs.retrieve( ps.getRequest(), + ps.getResponse() ); + + if( null != setKey ) { + if( Boolean.TRUE.equals( immediate ) ) { + prefs.set( setKey, setValue, true ); + } else { + prefs.set( setKey, setValue ); + } + } + + if( null != remove ) { + if( Boolean.TRUE.equals( immediate ) ) { + prefs.remove( remove, true ); + } else { + prefs.remove( remove ); + } + } + } + } ); + } +} |
Author: sskracic
Date: 2004-11-11 21:15:31 +0100 (Thu, 11 Nov 2004)
New Revision: 95
Removed:
tools/trunk/bundle/aclocal.m4
tools/trunk/bundle/bin/Makefile.in
tools/trunk/bundle/configure
tools/trunk/devel/bin/Makefile.in
tools/trunk/devel/etc/Makefile.in
tools/trunk/devel/etc/bin/Makefile.in
tools/trunk/devel/etc/project/Makefile.in
tools/trunk/devel/lib/Makefile.in
tools/trunk/devel/src/Makefile.in
tools/trunk/devel/src/com/Makefile.in
tools/trunk/devel/src/com/redhat/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/config/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/tools/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/tools/ant/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/tools/ant/taskdefs/Makefile.in
tools/trunk/devel/template/Makefile.in
tools/trunk/devel/template/custom/Makefile.in
tools/trunk/devel/template/custom/etc/Makefile.in
tools/trunk/devel/template/custom/pdl/Makefile.in
tools/trunk/devel/template/custom/sql/Makefile.in
tools/trunk/devel/template/custom/sql/oracle-se/Makefile.in
tools/trunk/devel/template/custom/sql/oracle-se/upgrade/Makefile.in
tools/trunk/devel/template/custom/src/Makefile.in
tools/trunk/devel/template/custom/web/Makefile.in
tools/trunk/devel/xsd/Makefile.in
tools/trunk/devel/xsl/Makefile.in
tools/trunk/scripts/bin/Makefile.in
tools/trunk/scripts/doc/Makefile.in
tools/trunk/scripts/etc/Makefile.in
tools/trunk/scripts/pkg/Makefile.in
tools/trunk/scripts/pkg/bin/Makefile.in
tools/trunk/scripts/pkg/bin/resin/Makefile.in
tools/trunk/scripts/pkg/bin/tomcat4/Makefile.in
tools/trunk/scripts/pkg/conf/Makefile.in
tools/trunk/scripts/pkg/conf/resin/Makefile.in
tools/trunk/scripts/pkg/conf/tomcat4/Makefile.in
tools/trunk/scripts/pkg/dist/Makefile.in
tools/trunk/scripts/template/Makefile.in
tools/trunk/tools/Makefile.in
tools/trunk/tools/Makefile.perl
tools/trunk/tools/aclocal.m4
tools/trunk/tools/bin/Makefile.in
tools/trunk/tools/commands/Makefile.in
tools/trunk/tools/configure
tools/trunk/tools/etc/Makefile.in
tools/trunk/tools/etc/ccm-tools/Makefile.in
tools/trunk/tools/etc/init.d/Makefile.in
tools/trunk/tools/etc/profile.d/Makefile.in
tools/trunk/tools/lib/CCM/Makefile.in
tools/trunk/tools/lib/CCM/Server/Makefile.in
tools/trunk/tools/lib/Makefile.in
tools/trunk/tools/lib/security/Makefile.in
tools/trunk/tools/server/Makefile.in
tools/trunk/tools/server/resin/Makefile.in
tools/trunk/tools/server/resin/bin/Makefile.in
tools/trunk/tools/server/resin/conf/Makefile.in
tools/trunk/tools/server/tomcat/Makefile.in
tools/trunk/tools/server/tomcat/bin/Makefile.in
tools/trunk/tools/server/tomcat/conf/Makefile.in
tools/trunk/tools/server/tomcat/lib/Makefile.in
tools/trunk/tools/server/tomcat/src/Makefile.in
tools/trunk/tools/server/tomcat/src/com/Makefile.in
tools/trunk/tools/server/tomcat/src/com/arsdigita/Makefile.in
tools/trunk/tools/server/tomcat/src/com/arsdigita/tools/Makefile.in
tools/trunk/tools/server/tomcat/src/com/arsdigita/tools/catalina/Makefile.in
tools/trunk/tools/server/tomcat/src/com/arsdigita/tools/catalina/startup/Makefile.in
Log:
Removing files committed by accident.
Deleted: tools/trunk/bundle/aclocal.m4
===================================================================
--- tools/trunk/bundle/aclocal.m4 2004-11-11 18:53:41 UTC (rev 94)
+++ tools/trunk/bundle/aclocal.m4 2004-11-11 20:15:31 UTC (rev 95)
@@ -1,104 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
-
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-# Do all the work for Automake. This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
- if test "[$]*" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
- fi
- if test "[$]*" != "X $srcdir/configure conftestfile" \
- && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
-alias in your environment])
- fi
-
- test "[$]2" = conftestfile
- )
-then
- # Ok.
- :
-else
- AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
- $1=$2
- AC_MSG_RESULT(found)
-else
- $1="$3/missing $2"
- AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
Deleted: tools/trunk/bundle/bin/Makefile.in
===================================================================
--- tools/trunk/bundle/bin/Makefile.in 2004-11-11 18:53:41 UTC (rev 94)
+++ tools/trunk/bundle/bin/Makefile.in 2004-11-11 20:15:31 UTC (rev 95)
@@ -1,202 +0,0 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-# Process with automake
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-MAKEINFO = @MAKEINFO@
-PACKAGE = @PACKAGE@
-RELEASE = @RELEASE@
-VERSION = @VERSION@
-
-AUTOMAKE_OPTIONS = foreign no-dependencies 1.4
-
-cfgdir = $(datadir)/ccm-tools/commands
-cfg_SCRIPTS = hostinit-bundle load-bundle hostinit-bundle.cmd load-bundle.cmd
-
-EXTRA_DIST = $(cfg_SCRIPTS)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES =
-SCRIPTS = $(cfg_SCRIPTS)
-
-DIST_COMMON = Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/Makefile
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- cd $(top_builddir) \
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-install-cfgSCRIPTS: $(cfg_SCRIPTS)
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(cfgdir)
- @list='$(cfg_SCRIPTS)'; for p in $$list; do \
- if test -f $$p; then \
- echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`"; \
- $(INSTALL_SCRIPT) $$p $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`; \
- else if test -f $(srcdir)/$$p; then \
- echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`"; \
- $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`; \
- else :; fi; fi; \
- done
-
-uninstall-cfgSCRIPTS:
- @$(NORMAL_UNINSTALL)
- list='$(cfg_SCRIPTS)'; for p in $$list; do \
- rm -f $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`; \
- done
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = bin
-
-distdir: $(DISTFILES)
- @for file in $(DISTFILES); do \
- d=$(srcdir); \
- if test -d $$d/$$file; then \
- cp -pr $$d/$$file $(distdir)/$$file; \
- else \
- test -f $(distdir)/$$file \
- || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
- || cp -p $$d/$$file $(distdir)/$$file || :; \
- fi; \
- done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
-check-am: all-am
- $(MAKE) $(AM_MAKEFLAGS) check-local
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am: install-cfgSCRIPTS
-install-data: install-data-am
-
-install-am: all-am
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am: uninstall-cfgSCRIPTS
-uninstall: uninstall-am
-all-am: Makefile $(SCRIPTS)
-all-redirect: all-am
-install-strip:
- $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
- $(mkinstalldirs) $(DESTDIR)$(cfgdir)
-
-
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
- -rm -f Makefile $(CONFIG_CLEAN_FILES)
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am: mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am: clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am: distclean-generic clean-am
-
-distclean: distclean-am
-
-maintainer-clean-am: maintainer-clean-generic distclean-am
- @echo "This command is intended for maintainers to use;"
- @echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: uninstall-cfgSCRIPTS install-cfgSCRIPTS tags distdir info-am \
-info dvi-am dvi check-local check check-am installcheck-am installcheck \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-check-local:
- perl -Tc hostinit-bundle
- perl -Tc load-bundle
-
-# End of files
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
Deleted: tools/trunk/bundle/configure
===================================================================
--- tools/trunk/bundle/configure 2004-11-11 18:53:41 UTC (rev 94)
+++ tools/trunk/bundle/configure 2004-11-11 20:15:31 UTC (rev 95)
@@ -1,2370 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57.
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization. ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
- emulate sh
- NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
- # is contrary to our usage. Disable this feature.
- alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
- set -o posix
-fi
-
-# Support unset when possible.
-if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
- as_unset=unset
-else
- as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- $as_unset $as_var
- fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
- as_basename=basename
-else
- as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)$' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
- /^X\/\(\/\/\)$/{ s//\1/; q; }
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
- else
- PATH_SEPARATOR=:
- fi
- rm -f conf$$.sh
-fi
-
-
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
- case $0 in
- *[\\/]* ) as_myself=$0 ;;
- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
- # in which case we are not to be found in the path.
- if test "x$as_myself" = x; then
- as_myself=$0
- fi
- if test ! -f "$as_myself"; then
- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
- { (exit 1); exit 1; }; }
- fi
- case $CONFIG_SHELL in
- '')
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for as_base in sh bash ksh sh5; do
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
- CONFIG_SHELL=$as_dir/$as_base
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$0" ${1+"$@"}
- fi;;
- esac
- done
-done
-;;
- esac
-
- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
- # uniformly replaced by the line number. The first 'sed' inserts a
- # line-number line before each line; the second 'sed' does the real
- # work. The second script uses 'N' to pair each line-number line
- # with the numbered line, and appends trailing '-' during
- # substitution so that $LINENO is not a special case at line end.
- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
- sed '=' <$as_myself |
- sed '
- N
- s,$,-,
- : loop
- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
- t loop
- s,-$,,
- s,^['$as_cr_digits']*\n,,
- ' >$as_me.lineno &&
- chmod +x $as_me.lineno ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
- { (exit 1); exit 1; }; }
-
- # Don't try to exec as it changes $[0], causing all sort of problems
- # (the dirname of $[0] is not the place where we might find the
- # original and so on. Autoconf is especially sensible to this).
- . ./$as_me.lineno
- # Exit status is that of the last command.
- exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
- *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T=' ' ;;
- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
- *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
- as_expr=expr
-else
- as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- # We could just check for DJGPP; but this test a) works b) is more generic
- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
- if test -f conf$$.exe; then
- # Don't use ln at all; we don't have any links
- as_ln_s='cp -p'
- else
- as_ln_s='ln -s'
- fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
-else
- as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
- as_mkdir_p=:
-else
- as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" $as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete. It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
-
-ac_unique_file="ccm-tools-bundle.spec.in"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE RELEASE LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
- # If the previous option needs an argument, assign it.
- if test -n "$ac_prev"; then
- eval "$ac_prev=\$ac_option"
- ac_prev=
- continue
- fi
-
- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
- case $ac_option in
-
- -bindir | --bindir | --bindi | --bind | --bin | --bi)
- ac_prev=bindir ;;
- -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
- bindir=$ac_optarg ;;
-
- -build | --build | --buil | --bui | --bu)
- ac_prev=build_alias ;;
- -build=* | --build=* | --buil=* | --bui=* | --bu=*)
- build_alias=$ac_optarg ;;
-
- -cache-file | --cache-file | --cache-fil | --cache-fi \
- | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
- ac_prev=cache_file ;;
- -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
- | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
- cache_file=$ac_optarg ;;
-
- --config-cache | -C)
- cache_file=config.cache ;;
-
- -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
- ac_prev=datadir ;;
- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
- | --da=*)
- datadir=$ac_optarg ;;
-
- -disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- eval "enable_$ac_feature=no" ;;
-
- -enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
- { (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "enable_$ac_feature='$ac_optarg'" ;;
-
- -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
- | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
- | --exec | --exe | --ex)
- ac_prev=exec_prefix ;;
- -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
- | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
- | --exec=* | --exe=* | --ex=*)
- exec_prefix=$ac_optarg ;;
-
- -gas | --gas | --ga | --g)
- # Obsolete; use --with-gas.
- with_gas=yes ;;
-
- -help | --help | --hel | --he | -h)
- ac_init_help=long ;;
- -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
- ac_init_help=recursive ;;
- -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
- ac_init_help=short ;;
-
- -host | --host | --hos | --ho)
- ac_prev=host_alias ;;
- -host=* | --host=* | --hos=* | --ho=*)
- host_alias=$ac_optarg ;;
-
- -includedir | --includedir | --includedi | --included | --include \
- | --includ | --inclu | --incl | --inc)
- ac_prev=includedir ;;
- -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
- | --includ=* | --inclu=* | --incl=* | --inc=*)
- includedir=$ac_optarg ;;
-
- -infodir | --infodir | --infodi | --infod | --info | --inf)
- ac_prev=infodir ;;
- -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
- infodir=$ac_optarg ;;
-
- -libdir | --libdir | --libdi | --libd)
- ac_prev=libdir ;;
- -libdir=* | --libdir=* | --libdi=* | --libd=*)
- libdir=$ac_optarg ;;
-
- -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
- | --libexe | --libex | --libe)
- ac_prev=libexecdir ;;
- -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
- | --libexe=* | --libex=* | --libe=*)
- libexecdir=$ac_optarg ;;
-
- -localstatedir | --localstatedir | --localstatedi | --localstated \
- | --localstate | --localstat | --localsta | --localst \
- | --locals | --local | --loca | --loc | --lo)
- ac_prev=localstatedir ;;
- -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
- | --localstate=* | --localstat=* | --localsta=* | --localst=* \
- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
- localstatedir=$ac_optarg ;;
-
- -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
- ac_prev=mandir ;;
- -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
- mandir=$ac_optarg ;;
-
- -nfp | --nfp | --nf)
- # Obsolete; use --without-fp.
- with_fp=no ;;
-
- -no-create | --no-create | --no-creat | --no-crea | --no-cre \
- | --no-cr | --no-c | -n)
- no_create=yes ;;
-
- -no-recursion | --no-recursion | --no-recursio | --no-recursi \
- | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
- no_recursion=yes ;;
-
- -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
- | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
- | --oldin | --oldi | --old | --ol | --o)
- ac_prev=oldincludedir ;;
- -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
- | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
- | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
- oldincludedir=$ac_optarg ;;
-
- -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
- ac_prev=prefix ;;
- -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
- prefix=$ac_optarg ;;
-
- -program-prefix | --program-prefix | --program-prefi | --program-pref \
- | --program-pre | --program-pr | --program-p)
- ac_prev=program_prefix ;;
- -program-prefix=* | --program-prefix=* | --program-prefi=* \
- | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
- program_prefix=$ac_optarg ;;
-
- -program-suffix | --program-suffix | --program-suffi | --program-suff \
- | --program-suf | --program-su | --program-s)
- ac_prev=program_suffix ;;
- -program-suffix=* | --program-suffix=* | --program-suffi=* \
- | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
- program_suffix=$ac_optarg ;;
-
- -program-transform-name | --program-transform-name \
- | --program-transform-nam | --program-transform-na \
- | --program-transform-n | --program-transform- \
- | --program-transform | --program-transfor \
- | --program-transfo | --program-transf \
- | --program-trans | --program-tran \
- | --progr-tra | --program-tr | --program-t)
- ac_prev=program_transform_name ;;
- -program-transform-name=* | --program-transform-name=* \
- | --program-transform-nam=* | --program-transform-na=* \
- | --program-transform-n=* | --program-transform-=* \
- | --program-transform=* | --program-transfor=* \
- | --program-transfo=* | --program-transf=* \
- | --program-trans=* | --program-tran=* \
- | --progr-tra=* | --program-tr=* | --program-t=*)
- program_transform_name=$ac_optarg ;;
-
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
- | --sbi=* | --sb=*)
- sbindir=$ac_optarg ;;
-
- -sharedstatedir | --sharedstatedir | --sharedstatedi \
- | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
- | --sharedst | --shareds | --shared | --share | --shar \
- | --sha | --sh)
- ac_prev=sharedstatedir ;;
- -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
- | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
- | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
- | --sha=* | --sh=*)
- sharedstatedir=$ac_optarg ;;
-
- -site | --site | --sit)
- ac_prev=site ;;
- -site=* | --site=* | --sit=*)
- site=$ac_optarg ;;
-
- -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
- ac_prev=srcdir ;;
- -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
- srcdir=$ac_optarg ;;
-
- -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
- | --syscon | --sysco | --sysc | --sys | --sy)
- ac_prev=sysconfdir ;;
- -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
- | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
- sysconfdir=$ac_optarg ;;
-
- -target | --target | --targe | --targ | --tar | --ta | --t)
- ac_prev=target_alias ;;
- -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
- target_alias=$ac_optarg ;;
-
- -v | -verbose | --verbose | --verbos | --verbo | --verb)
- verbose=yes ;;
-
- -version | --version | --versio | --versi | --vers | -V)
- ac_init_version=: ;;
-
- -with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
- case $ac_option in
- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
- *) ac_optarg=yes ;;
- esac
- eval "with_$ac_package='$ac_optarg'" ;;
-
- -without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
- # Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
- { (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
- eval "with_$ac_package=no" ;;
-
- --x)
- # Obsolete; use --with-x.
- with_x=yes ;;
-
- -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
- | --x-incl | --x-inc | --x-in | --x-i)
- ac_prev=x_includes ;;
- -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
- | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
- x_includes=$ac_optarg ;;
-
- -x-libraries | --x-libraries | --x-librarie | --x-librari \
- | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
- ac_prev=x_libraries ;;
- -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
- | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
- x_libraries=$ac_optarg ;;
-
- -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
- { (exit 1); exit 1; }; }
- ;;
-
- *=*)
- ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
- # Reject names that are not valid shell variable names.
- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
- { (exit 1); exit 1; }; }
- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
- eval "$ac_envvar='$ac_optarg'"
- export $ac_envvar ;;
-
- *)
- # FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
- expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
- : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
- ;;
-
- esac
-done
-
-if test -n "$ac_prev"; then
- ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
- { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
- localstatedir libdir includedir oldincludedir infodir mandir
-do
- eval ac_val=$`echo $ac_var`
- case $ac_val in
- [\\/$]* | ?:[\\/]* ) ;;
- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
- { (exit 1); exit 1; }; };;
- esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
- if test "x$build_alias" = x; then
- cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
- If a cross compiler is detected then cross compile mode will be used." >&2
- elif test "x$build_alias" != "x$host_alias"; then
- cross_compiling=yes
- fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
- ac_srcdir_defaulted=yes
- # Try the directory containing this script, then its parent.
- ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| \
- . : '\(.\)' 2>/dev/null ||
-echo X"$0" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
- /^X\(\/\/\)$/{ s//\1/; q; }
- /^X\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
- srcdir=$ac_confdir
- if test ! -r $srcdir/$ac_unique_file; then
- srcdir=..
- fi
-else
- ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
- if test "$ac_srcdir_defaulted" = yes; then
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
- { (exit 1); exit 1; }; }
- else
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
- { (exit 1); exit 1; }; }
- fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
- { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
- # Omit some internal or obsolete options to make the list less imposing.
- # This message is too long to be a string in the A/UX 3.1 sh.
- cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE. See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
- -h, --help display this help and exit
- --help=short display options specific to this package
- --help=recursive display the short help of all the included packages
- -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking...' messages
- --cache-file=FILE cache test results in FILE [disabled]
- -C, --config-cache alias for \`--cache-file=config.cache'
- -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
- cat <<_ACEOF
-Installation directories:
- --prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
- --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --datadir=DIR read-only architecture-independent data [PREFIX/share]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --infodir=DIR info documentation [PREFIX/info]
- --mandir=DIR man documentation [PREFIX/man]
-_ACEOF
-
- cat <<\_ACEOF
-
-Program names:
- --program-prefix=PREFIX prepend PREFIX to installed program names
- --program-suffix=SUFFIX append SUFFIX to installed program names
- --program-transform-name=PROGRAM run sed PROGRAM on installed program names
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-
- cat <<\_ACEOF
-
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
- # If there are subdirs, report their specific --help.
- ac_popdir=`pwd`
- for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d $ac_dir || continue
- ac_builddir=.
-
-if test "$ac_dir" != .; then
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
- # A "../" for each directory in $ac_dir_suffix.
- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
- ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
- .) # No --srcdir option. We are building in place.
- ac_srcdir=.
- if test -z "$ac_top_builddir"; then
- ac_top_srcdir=.
- else
- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
- fi ;;
- [\\/]* | ?:[\\/]* ) # Absolute path.
- ac_srcdir=$srcdir$ac_dir_suffix;
- ac_top_srcdir=$srcdir ;;
- *) # Relative path.
- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
-# absolute.
-ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
-
- cd $ac_dir
- # Check for guested configure; otherwise get Cygnus style configure.
- if test -f $ac_srcdir/configure.gnu; then
- echo
- $SHELL $ac_srcdir/configure.gnu --help=recursive
- elif test -f $ac_srcdir/configure; then
- echo
- $SHELL $ac_srcdir/configure --help=recursive
- elif test -f $ac_srcdir/configure.ac ||
- test -f $ac_srcdir/configure.in; then
- echo
- $ac_configure --help
- else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
- fi
- cd $ac_popdir
- done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
- cat <<\_ACEOF
-
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
- exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by $as_me, which was
-generated by GNU Autoconf 2.57. Invocation command line was
-
- $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
-
-/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
-/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
-/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
-/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
-/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
- for ac_arg
- do
- case $ac_arg in
- -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
- -q | -quiet | --quiet | --quie | --qui | --qu | --q \
- | -silent | --silent | --silen | --sile | --sil)
- continue ;;
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
- esac
- case $ac_pass in
- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
- 2)
- ac_configure_args1="$ac_configure_args1 '$ac_arg'"
- if test $ac_must_keep_next = true; then
- ac_must_keep_next=false # Got value, back to normal.
- else
- case $ac_arg in
- *=* | --config-cache | -C | -disable-* | --disable-* \
- | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
- | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
- | -with-* | --with-* | -without-* | --without-* | --x)
- case "$ac_configure_args0 " in
- "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
- esac
- ;;
- -* ) ac_must_keep_next=true ;;
- esac
- fi
- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
- # Get rid of the leading space.
- ac_sep=" "
- ;;
- esac
- done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log. We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
- # Save into config.log some information that might help in debugging.
- {
- echo
-
- cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
- echo
- # The following way of writing the cache mishandles newlines in values,
-{
- (set) 2>&1 |
- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
- *ac_space=\ *)
- sed -n \
- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
- ;;
- *)
- sed -n \
- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
- ;;
- esac;
-}
- echo
-
- cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
- echo
- for ac_var in $ac_subst_vars
- do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
- done | sort
- echo
-
- if test -n "$ac_subst_files"; then
- cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
- echo
- for ac_var in $ac_subst_files
- do
- eval ac_val=$`echo $ac_var`
- echo "$ac_var='"'"'$ac_val'"'"'"
- done | sort
- echo
- fi
-
- if test -s confdefs.h; then
- cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
- echo
- sed "/^$/d" confdefs.h | sort
- echo
- fi
- test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
- } >&5
- rm -f core core.* *.core &&
- rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
- exit $exit_status
- ' 0
-for ac_signal in 1 2 13 15; do
- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
- if test "x$prefix" != xNONE; then
- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
- else
- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
- fi
-fi
-for ac_site_file in $CONFIG_SITE; do
- if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
- sed 's/^/| /' "$ac_site_file" >&5
- . "$ac_site_file"
- fi
-done
-
-if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
- case $cache_file in
- [\\/]* | ?:[\\/]* ) . $cache_file;;
- *) . ./$cache_file;;
- esac
- fi
-else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
- >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
- eval ac_old_set=\$ac_cv_env_${ac_var}_set
- eval ac_new_set=\$ac_env_${ac_var}_set
- eval ac_old_val="\$ac_cv_env_${ac_var}_value"
- eval ac_new_val="\$ac_env_${ac_var}_value"
- case $ac_old_set,$ac_new_set in
- set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
- ac_cache_corrupted=: ;;
- ,);;
- *)
- if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
- fi;;
- esac
- # Pass precious variables to config.status.
- if test "$ac_new_set" = set; then
- case $ac_new_val in
- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
- *) ac_arg=$ac_var=$ac_new_val ;;
- esac
- case " $ac_configure_args " in
- *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
- esac
- fi
-done
-if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-VERSION=1.0.0
-RELEASE=5
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
- if test -f $ac_dir/install-sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f $ac_dir/install.sh; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f $ac_dir/shtool; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
- { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Find a good install program. We prefer a C program (faster),
-# so one script is as good as another. But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
- ./ | .// | /cC/* | \
- /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
- /usr/ucb/* ) ;;
- *)
- # OSF1 and SCO ODT 3.0 have their own names for install.
- # Don't use installbsd from OSF since it installs stuff as root
- # by default.
- for ac_prog in ginstall scoinst install; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
- if test $ac_prog = install &&
- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # AIX install. It has an incompatible calling convention.
- :
- elif test $ac_prog = install &&
- grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- # program-specific install script used by HP pwplus--don't use.
- :
- else
- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
- break 3
- fi
- fi
- done
- done
- ;;
-esac
-done
-
-
-fi
- if test "${ac_cv_path_install+set}" = set; then
- INSTALL=$ac_cv_path_install
- else
- # As a last resort, use the slow shell script. We don't cache a
- # path for INSTALL within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the path is relative.
- INSTALL=$ac_install_sh
- fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments. Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
- set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
- if test "$*" = "X"; then
- # -L didn't work.
- set X `ls -t $srcdir/configure conftestfile`
- fi
- if test "$*" != "X $srcdir/configure conftestfile" \
- && test "$*" != "X conftestfile $srcdir/configure"; then
-
- # If neither matched, then we have a broken ls. This can happen
- # if, for instance, CONFIG_SHELL is bash and it inherits a
- # broken ls alias from the environment. This has actually
- # happened. Such a system could not be considered "sane".
- { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
-alias in your environment" >&2;}
- { (exit 1); exit 1; }; }
- fi
-
- test "$2" = conftestfile
- )
-then
- # Ok.
- :
-else
- { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
- { (exit 1); exit 1; }; }
-fi
-rm -f conftest*
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-test "$program_prefix" != NONE &&
- program_transform_name="s,^,$program_prefix,;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
- program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $. echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.make <<\_ACEOF
-all:
- @echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
- eval ac_cv_prog_make_${ac_make}_set=yes
-else
- eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- SET_MAKE=
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
- SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE=ccm-tools-bundle
-
-VERSION=$VERSION
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo "$as_me:$LINENO: checking for working aclocal" >&5
-echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf. Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
- ACLOCAL=aclocal
- echo "$as_me:$LINENO: result: found" >&5
-e...
[truncated message content] |
|
From: <ssk...@re...> - 2004-11-11 19:01:03
|
Author: sskracic
Date: 2004-11-11 19:53:41 +0100 (Thu, 11 Nov 2004)
New Revision: 94
Modified:
tools/trunk/misc/build-all.sh
Log:
Vastly improved way of autogenerating the project.xml,
which now takes <prebuilt> section right out from the
<dependencies> section of application.xml.
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2004-11-11 18:14:35 UTC (rev 93)
+++ tools/trunk/misc/build-all.sh 2004-11-11 18:53:41 UTC (rev 94)
@@ -301,10 +301,13 @@
(
set -e
cd $i
- # generate skeleton project.xml
- # But! We must list all installed WAF RPMs in
- # <prebuilt> section of project.xml, otherwise
- # no build.xml will be generated.
+ # Generate skeleton project.xml.
+ # We will cheat and simply copy the <ccm:dependencies>
+ # from application.xml into <ccm:prebuilt> block of
+ # project.xml. By doing this we will satisfy
+ # the dependency information needed to perform XSL
+ # transformation when creating the build.xml.
+ appxml=$(cat $i/application.xml)
cat > project.xml <<EOF
<?xml version="1.0" encoding="ISO-8859-1"?>
@@ -319,7 +322,7 @@
</ccm:build>
<ccm:prebuilt>
-$($RPM $RPM_ARGS -qa --qf "<ccm:application name=\"%{NAME}\" version=\"%{VERSION}\"/>\n" 'ccm*')
+$(sed -n '/<ccm:dependencies>/,/<\/ccm:dependencies>/s/requires/application/p' < $CCM_APP/application.xml)
</ccm:prebuilt>
</ccm:project>
|
|
From: <mb...@re...> - 2004-11-11 18:21:46
|
Author: mbooth
Date: 2004-11-11 19:14:35 +0100 (Thu, 11 Nov 2004)
New Revision: 93
Modified:
ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java
Log:
Fix a bug which prevents resolution of items containing special characters
Modified: ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java
===================================================================
--- ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java 2004-11-11 16:45:33 UTC (rev 92)
+++ ccm-cms/trunk/src/com/arsdigita/cms/dispatcher/MultilingualItemResolver.java 2004-11-11 18:14:35 UTC (rev 93)
@@ -35,7 +35,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
-import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -722,19 +721,20 @@
// will have deal with 'foo' folder.
String name = index > 0 ? url.substring(0, index) : "";
- parentFolder = name != "" ? (Folder) parentFolder.getItem(URLEncoder.encode(name), true) : parentFolder;
+ parentFolder = name != "" ? (Folder) parentFolder.getItem(name, true) : parentFolder;
url = index + 1 < len ? url.substring(index + 1) : "";
return getItemFromLiveURL(url, parentFolder);
} else {
s_log.debug("Found a file element in the URL");
- String[] nameAndLang = getNameAndLangFromURLFrag(url);
+ String[] nameAndLang = getNameAndLangFromURLFrag(url);
String name = nameAndLang[0];
String lang = nameAndLang[1];
- ContentItem item = parentFolder.getItem(URLEncoder.encode(name), false);
- return getItemFromLangAndBundle(lang, item);
+ ContentItem item = parentFolder.getItem(name, false);
+
+ return getItemFromLangAndBundle(lang, item);
}
}
|
|
From: <ssk...@re...> - 2004-11-11 16:52:50
|
Author: sskracic
Date: 2004-11-11 17:45:33 +0100 (Thu, 11 Nov 2004)
New Revision: 92
Modified:
tools/trunk/misc/build-all.sh
Log:
The script now autogenerates an approximation of project.xml
in the top-level app directory, ie. in $BUILD_HOME/ccm-cms,
not in the $BUILD_HOME/ccm-cms/ccm-cms. It constructs the
<ccm:prebuilt> list based on the currently installed ccm-*
RPMs (in virtual rpm db, of course).
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2004-11-10 23:11:10 UTC (rev 91)
+++ tools/trunk/misc/build-all.sh 2004-11-11 16:45:33 UTC (rev 92)
@@ -174,8 +174,15 @@
mkdir -p $VIRTUAL_ROOT/etc/ccm
mkdir -p $VIRTUAL_ROOT/etc/profile.d
mkdir -p $VIRTUAL_ROOT/share/ccm-tools
+ mkdir -p $VIRTUAL_ROOT/share/doc
+ mkdir -p $VIRTUAL_ROOT/bin
+ mkdir -p $VIRTUAL_ROOT/var/cache
+ mkdir -p $VIRTUAL_ROOT/var/lib/ccm
+ mkdir -p $VIRTUAL_ROOT/var/lib/ccm-devel
+ mkdir -p $VIRTUAL_ROOT/var/log
+ mkdir -p $VIRTUAL_ROOT/var/opt/ccm/data
- $RPM --dbpath $RPM_DB --initdb
+ $RPM $RPM_ARGS --initdb
cat > fake.spec <<EOF
Name: fake
@@ -206,6 +213,8 @@
Provides: perl(File::Copy)
Provides: perl(File::Find)
Provides: perl(POSIX)
+Provides: perl(Carp)
+Provides: perl(lib)
%description
@@ -216,7 +225,7 @@
rpmbuild -ba fake.spec
- $RPM --dbpath $RPM_DB -ivh $HOMERPMDIR/fake-2.0.0-1.noarch.rpm
+ $RPM $RPM_ARGS -ivh $HOMERPMDIR/fake-2.0.0-1.noarch.rpm
# Build the build tools
for i in httpunit junit junitperf servlet servlet22
@@ -292,10 +301,41 @@
(
set -e
cd $i
+ # generate skeleton project.xml
+ # But! We must list all installed WAF RPMs in
+ # <prebuilt> section of project.xml, otherwise
+ # no build.xml will be generated.
+ cat > project.xml <<EOF
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<ccm:project name="$CCM_APP"
+ prettyName="Red Hat Web Application Framework"
+ ccmVersion="6.1"
+ versionFrom="$CCM_APP"
+ xmlns:ccm="http://ccm.redhat.com/ccm-project">
+
+ <ccm:build>
+ <ccm:application name="$CCM_APP" prettyName="Red Hat Web Application Framework" buildOrder="1"/>
+ </ccm:build>
+
+ <ccm:prebuilt>
+$($RPM $RPM_ARGS -qa --qf "<ccm:application name=\"%{NAME}\" version=\"%{VERSION}\"/>\n" 'ccm*')
+ </ccm:prebuilt>
+
+</ccm:project>
+EOF
+
echo "BUILDING $i in directory `pwd`"
- rm -rf rollingbuild
export CCM_APPS=$i
- $BUILD_HOME/rollingbuild.sh
+ rm -rf rollingbuild build MANIFEST MANIFEST.SKIP
+
+ if [ "x$AUTO_BUILD_COUNTER" != "x" ]; then
+ CCM_BUILD_COUNTER=$AUTO_BUILD_COUNTER
+ export CCM_BUILD_COUNTER
+ fi
+
+ $CCM_SCRIPTS_HOME/bin/build.sh
+
) || exit $?
(
set -e
|
|
From: <ssk...@re...> - 2004-11-10 23:18:38
|
Author: sskracic Date: 2004-11-11 00:11:10 +0100 (Thu, 11 Nov 2004) New Revision: 91 Modified: tools/trunk/bundle/rollingbuild.sh Log: RPM building should be done exclusively with rpmbuild, not rpm. Modified: tools/trunk/bundle/rollingbuild.sh =================================================================== --- tools/trunk/bundle/rollingbuild.sh 2004-11-09 21:13:24 UTC (rev 90) +++ tools/trunk/bundle/rollingbuild.sh 2004-11-10 23:11:10 UTC (rev 91) @@ -32,7 +32,7 @@ make dist # Build the rpms -rpm -ta --clean ccm-tools-bundle-*.tar.gz +rpmbuild -ta --clean ccm-tools-bundle-*.tar.gz ./make-zip.sh |
|
From: <ssk...@re...> - 2004-11-09 21:20:33
|
Author: sskracic
Date: 2004-11-09 22:13:24 +0100 (Tue, 09 Nov 2004)
New Revision: 90
Modified:
tools/trunk/devel/ccm-devel.spec.in
tools/trunk/misc/build-all.sh
tools/trunk/scripts/pkg/dist/rpm.spec.in
tools/trunk/scripts/pkg/dist/rpm.spec.java-standalone.in
Log:
Hotfixing the build process. Several extremely tiny fixes
needed to get this process going, and project.xml and
rollingbuild.sh files are still missing from the top-level
application directories.
Modified: tools/trunk/devel/ccm-devel.spec.in
===================================================================
--- tools/trunk/devel/ccm-devel.spec.in 2004-11-09 12:54:34 UTC (rev 89)
+++ tools/trunk/devel/ccm-devel.spec.in 2004-11-09 21:13:24 UTC (rev 90)
@@ -78,6 +78,11 @@
perl -i -p -e "s,/usr,${USR_DIR}," $ETC_DIR/profile.d/%{name}.sh
fi
+JAVA_DIR=`echo /usr/share/%{name}/lib | sed -e "s,/usr,$USR_DIR,"`
+cd $JAVA_DIR
+ln -sf ant-contrib-0.6.jar ant-contrib.jar
+ln -sf jakarta-oro-2.0.4.jar jakarta-oro.jar
+
%post cvs
ETC_DIR=$RPM_INSTALL_PREFIX0
VAR_DIR=$RPM_INSTALL_PREFIX2
Modified: tools/trunk/misc/build-all.sh
===================================================================
--- tools/trunk/misc/build-all.sh 2004-11-09 12:54:34 UTC (rev 89)
+++ tools/trunk/misc/build-all.sh 2004-11-09 21:13:24 UTC (rev 90)
@@ -166,6 +166,15 @@
mkdir $VIRTUAL_ROOT
mkdir $VIRTUAL_ROOT/rpmdb
+
+ # (20041108 Seb)
+ # This directory must exist because 'rpm -i' of httpunit and friends will fail.
+ # In a real world, this dir would have been already created by the packages httpunit at ali depend on.
+ mkdir -p $VIRTUAL_ROOT/share/java
+ mkdir -p $VIRTUAL_ROOT/etc/ccm
+ mkdir -p $VIRTUAL_ROOT/etc/profile.d
+ mkdir -p $VIRTUAL_ROOT/share/ccm-tools
+
$RPM --dbpath $RPM_DB --initdb
cat > fake.spec <<EOF
@@ -194,7 +203,11 @@
Provides: perl(vars)
Provides: perl(Cwd)
Provides: perl(File::Spec)
+Provides: perl(File::Copy)
+Provides: perl(File::Find)
+Provides: perl(POSIX)
+
%description
Fake
@@ -282,7 +295,7 @@
echo "BUILDING $i in directory `pwd`"
rm -rf rollingbuild
export CCM_APPS=$i
- ./rollingbuild.sh
+ $BUILD_HOME/rollingbuild.sh
) || exit $?
(
set -e
Modified: tools/trunk/scripts/pkg/dist/rpm.spec.in
===================================================================
--- tools/trunk/scripts/pkg/dist/rpm.spec.in 2004-11-09 12:54:34 UTC (rev 89)
+++ tools/trunk/scripts/pkg/dist/rpm.spec.in 2004-11-09 21:13:24 UTC (rev 90)
@@ -90,7 +90,7 @@
fi
if [ -n "$AUTO_BUILD_ROOT" ]; then
- cp -vr --preserve=all $RPM_BUILD_ROOT/* $AUTO_BUILD_ROOT
+ cp -vr --preserve $RPM_BUILD_ROOT/* $AUTO_BUILD_ROOT
if [ "%{version}" != "%{appversion}" ] && [ -d $AUTO_BUILD_ROOT/usr/share/java ]; then
cd $AUTO_BUILD_ROOT/usr/share/java
for extension in .jar -sql.jar -pdl.jar -system.jar ""; do
Modified: tools/trunk/scripts/pkg/dist/rpm.spec.java-standalone.in
===================================================================
--- tools/trunk/scripts/pkg/dist/rpm.spec.java-standalone.in 2004-11-09 12:54:34 UTC (rev 89)
+++ tools/trunk/scripts/pkg/dist/rpm.spec.java-standalone.in 2004-11-09 21:13:24 UTC (rev 90)
@@ -104,7 +104,7 @@
if [ -n "$AUTO_BUILD_ROOT" ]; then
mkdir -p $AUTO_BUILD_ROOT/usr/share/java
- cp -vrf --preserve=all %{buildroot}/* $AUTO_BUILD_ROOT
+ cp -vrf --preserve %{buildroot}/* $AUTO_BUILD_ROOT
fi
rm -f "$RPM_BUILD_DIR/%{name}-%{appversion}/filelist.rpm"
|
Author: mbooth
Date: 2004-11-09 13:54:34 +0100 (Tue, 09 Nov 2004)
New Revision: 89
Added:
tools/trunk/bundle/aclocal.m4
tools/trunk/bundle/bin/Makefile.in
tools/trunk/bundle/configure
tools/trunk/devel/bin/Makefile.in
tools/trunk/devel/etc/Makefile.in
tools/trunk/devel/etc/bin/Makefile.in
tools/trunk/devel/etc/project/Makefile.in
tools/trunk/devel/lib/Makefile.in
tools/trunk/devel/src/Makefile.in
tools/trunk/devel/src/com/Makefile.in
tools/trunk/devel/src/com/redhat/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/config/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/tools/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/tools/ant/Makefile.in
tools/trunk/devel/src/com/redhat/ccm/tools/ant/taskdefs/Makefile.in
tools/trunk/devel/template/Makefile.in
tools/trunk/devel/template/custom/Makefile.in
tools/trunk/devel/template/custom/etc/Makefile.in
tools/trunk/devel/template/custom/pdl/Makefile.in
tools/trunk/devel/template/custom/sql/Makefile.in
tools/trunk/devel/template/custom/sql/oracle-se/Makefile.in
tools/trunk/devel/template/custom/sql/oracle-se/upgrade/Makefile.in
tools/trunk/devel/template/custom/src/Makefile.in
tools/trunk/devel/template/custom/web/Makefile.in
tools/trunk/devel/xsd/Makefile.in
tools/trunk/devel/xsl/Makefile.in
tools/trunk/scripts/bin/.extract-version.pl.test
tools/trunk/scripts/bin/.filter-manifest.pl.test
tools/trunk/scripts/bin/.gen-prototype.pl.test
tools/trunk/scripts/bin/.interpolate.pl.test
tools/trunk/scripts/bin/Makefile.in
tools/trunk/scripts/doc/Makefile.in
tools/trunk/scripts/etc/Makefile.in
tools/trunk/scripts/pkg/Makefile.in
tools/trunk/scripts/pkg/bin/Makefile.in
tools/trunk/scripts/pkg/bin/resin/Makefile.in
tools/trunk/scripts/pkg/bin/tomcat4/Makefile.in
tools/trunk/scripts/pkg/conf/Makefile.in
tools/trunk/scripts/pkg/conf/resin/Makefile.in
tools/trunk/scripts/pkg/conf/tomcat4/Makefile.in
tools/trunk/scripts/pkg/dist/Makefile.in
tools/trunk/scripts/template/Makefile.in
tools/trunk/tools/Makefile.in
tools/trunk/tools/Makefile.perl
tools/trunk/tools/aclocal.m4
tools/trunk/tools/bin/Makefile.in
tools/trunk/tools/commands/Makefile.in
tools/trunk/tools/configure
tools/trunk/tools/etc/Makefile.in
tools/trunk/tools/etc/ccm-tools-resin.cmd
tools/trunk/tools/etc/ccm-tools-resin.sh
tools/trunk/tools/etc/ccm-tools-tomcat.cmd
tools/trunk/tools/etc/ccm-tools-tomcat.sh
tools/trunk/tools/etc/ccm-tools.cmd
tools/trunk/tools/etc/ccm-tools.sh
tools/trunk/tools/etc/ccm-tools/Makefile.in
tools/trunk/tools/etc/init.d/Makefile.in
tools/trunk/tools/etc/profile.d/Makefile.in
tools/trunk/tools/lib/CCM/Makefile.in
tools/trunk/tools/lib/CCM/Server/Makefile.in
tools/trunk/tools/lib/Makefile.in
tools/trunk/tools/lib/security/Makefile.in
tools/trunk/tools/pm_to_blib
tools/trunk/tools/server/Makefile.in
tools/trunk/tools/server/resin/Makefile.in
tools/trunk/tools/server/resin/bin/Makefile.in
tools/trunk/tools/server/resin/conf/Makefile.in
tools/trunk/tools/server/tomcat/Makefile.in
tools/trunk/tools/server/tomcat/bin/Makefile.in
tools/trunk/tools/server/tomcat/conf/Makefile.in
tools/trunk/tools/server/tomcat/lib/Makefile.in
tools/trunk/tools/server/tomcat/src/Makefile.in
tools/trunk/tools/server/tomcat/src/com/Makefile.in
tools/trunk/tools/server/tomcat/src/com/arsdigita/Makefile.in
tools/trunk/tools/server/tomcat/src/com/arsdigita/tools/Makefile.in
tools/trunk/tools/server/tomcat/src/com/arsdigita/tools/catalina/Makefile.in
tools/trunk/tools/server/tomcat/src/com/arsdigita/tools/catalina/startup/Makefile.in
Modified:
tools/trunk/tools/lib/CCM/Interpolate.pm
tools/trunk/tools/server/resin/bin/resin-conf-gen
tools/trunk/tools/server/tomcat/bin/tomcat-conf-gen
Log:
Update a bunch of tools
Added: tools/trunk/bundle/aclocal.m4
===================================================================
--- tools/trunk/bundle/aclocal.m4 2004-11-05 23:43:55 UTC (rev 88)
+++ tools/trunk/bundle/aclocal.m4 2004-11-09 12:54:34 UTC (rev 89)
@@ -0,0 +1,104 @@
+dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+
+dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
+# Do all the work for Automake. This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN([AM_INIT_AUTOMAKE],
+[AC_REQUIRE([AC_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+#
+# Check to make sure that the build environment is sane.
+#
+
+AC_DEFUN([AM_SANITY_CHECK],
+[AC_MSG_CHECKING([whether build environment is sane])
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+ if test "[$]*" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftestfile`
+ fi
+ if test "[$]*" != "X $srcdir/configure conftestfile" \
+ && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+alias in your environment])
+ fi
+
+ test "[$]2" = conftestfile
+ )
+then
+ # Ok.
+ :
+else
+ AC_MSG_ERROR([newly created file is older than distributed files!
+Check your system clock])
+fi
+rm -f conftest*
+AC_MSG_RESULT(yes)])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN([AM_MISSING_PROG],
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf. Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+ $1=$2
+ AC_MSG_RESULT(found)
+else
+ $1="$3/missing $2"
+ AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
Added: tools/trunk/bundle/bin/Makefile.in
===================================================================
--- tools/trunk/bundle/bin/Makefile.in 2004-11-05 23:43:55 UTC (rev 88)
+++ tools/trunk/bundle/bin/Makefile.in 2004-11-09 12:54:34 UTC (rev 89)
@@ -0,0 +1,202 @@
+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# Process with automake
+
+
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DESTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = ..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
+RELEASE = @RELEASE@
+VERSION = @VERSION@
+
+AUTOMAKE_OPTIONS = foreign no-dependencies 1.4
+
+cfgdir = $(datadir)/ccm-tools/commands
+cfg_SCRIPTS = hostinit-bundle load-bundle hostinit-bundle.cmd load-bundle.cmd
+
+EXTRA_DIST = $(cfg_SCRIPTS)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_CLEAN_FILES =
+SCRIPTS = $(cfg_SCRIPTS)
+
+DIST_COMMON = Makefile.am Makefile.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = gtar
+GZIP_ENV = --best
+all: all-redirect
+.SUFFIXES:
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+ cd $(top_srcdir) && $(AUTOMAKE) --foreign bin/Makefile
+
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) \
+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+
+install-cfgSCRIPTS: $(cfg_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(cfgdir)
+ @list='$(cfg_SCRIPTS)'; for p in $$list; do \
+ if test -f $$p; then \
+ echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $$p $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`; \
+ else if test -f $(srcdir)/$$p; then \
+ echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`"; \
+ $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`; \
+ else :; fi; fi; \
+ done
+
+uninstall-cfgSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ list='$(cfg_SCRIPTS)'; for p in $$list; do \
+ rm -f $(DESTDIR)$(cfgdir)/`echo $$p|sed '$(transform)'`; \
+ done
+tags: TAGS
+TAGS:
+
+
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+
+subdir = bin
+
+distdir: $(DISTFILES)
+ @for file in $(DISTFILES); do \
+ d=$(srcdir); \
+ if test -d $$d/$$file; then \
+ cp -pr $$d/$$file $(distdir)/$$file; \
+ else \
+ test -f $(distdir)/$$file \
+ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
+ fi; \
+ done
+info-am:
+info: info-am
+dvi-am:
+dvi: dvi-am
+check-am: all-am
+ $(MAKE) $(AM_MAKEFLAGS) check-local
+check: check-am
+installcheck-am:
+installcheck: installcheck-am
+install-exec-am:
+install-exec: install-exec-am
+
+install-data-am: install-cfgSCRIPTS
+install-data: install-data-am
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+install: install-am
+uninstall-am: uninstall-cfgSCRIPTS
+uninstall: uninstall-am
+all-am: Makefile $(SCRIPTS)
+all-redirect: all-am
+install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+installdirs:
+ $(mkinstalldirs) $(DESTDIR)$(cfgdir)
+
+
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+ -rm -f Makefile $(CONFIG_CLEAN_FILES)
+ -rm -f config.cache config.log stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+mostlyclean-am: mostlyclean-generic
+
+mostlyclean: mostlyclean-am
+
+clean-am: clean-generic mostlyclean-am
+
+clean: clean-am
+
+distclean-am: distclean-generic clean-am
+
+distclean: distclean-am
+
+maintainer-clean-am: maintainer-clean-generic distclean-am
+ @echo "This command is intended for maintainers to use;"
+ @echo "it deletes files that may require special tools to rebuild."
+
+maintainer-clean: maintainer-clean-am
+
+.PHONY: uninstall-cfgSCRIPTS install-cfgSCRIPTS tags distdir info-am \
+info dvi-am dvi check-local check check-am installcheck-am installcheck \
+install-exec-am install-exec install-data-am install-data install-am \
+install uninstall-am uninstall all-redirect all-am all installdirs \
+mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+check-local:
+ perl -Tc hostinit-bundle
+ perl -Tc load-bundle
+
+# End of files
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Added: tools/trunk/bundle/configure
===================================================================
--- tools/trunk/bundle/configure 2004-11-05 23:43:55 UTC (rev 88)
+++ tools/trunk/bundle/configure 2004-11-09 12:54:34 UTC (rev 89)
@@ -0,0 +1,2370 @@
+#! /bin/sh
+# Guess values for system-dependent variables and create Makefiles.
+# Generated by GNU Autoconf 2.57.
+#
+# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This configure script is free software; the Free Software Foundation
+# gives unlimited permission to copy, distribute and modify it.
+## --------------------- ##
+## M4sh Initialization. ##
+## --------------------- ##
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+ set -o posix
+fi
+
+# Support unset when possible.
+if (FOO=FOO; unset FOO) >/dev/null 2>&1; then
+ as_unset=unset
+else
+ as_unset=false
+fi
+
+
+# Work around bugs in pre-3.0 UWIN ksh.
+$as_unset ENV MAIL MAILPATH
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+for as_var in \
+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
+ LC_TELEPHONE LC_TIME
+do
+ if (set +x; test -n "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+ $as_unset $as_var
+ fi
+done
+
+# Required to use basename.
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
+ as_basename=basename
+else
+ as_basename=false
+fi
+
+
+# Name of the executable.
+as_me=`$as_basename "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)$' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X/"$0" |
+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
+ /^X\/\(\/\/\)$/{ s//\1/; q; }
+ /^X\/\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+
+
+# PATH needs CR, and LINENO needs CR and PATH.
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ echo "#! /bin/sh" >conf$$.sh
+ echo "exit 0" >>conf$$.sh
+ chmod +x conf$$.sh
+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
+ PATH_SEPARATOR=';'
+ else
+ PATH_SEPARATOR=:
+ fi
+ rm -f conf$$.sh
+fi
+
+
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" || {
+ # Find who we are. Look in the path if we contain no path at all
+ # relative or not.
+ case $0 in
+ *[\\/]* ) as_myself=$0 ;;
+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+done
+
+ ;;
+ esac
+ # We did not find ourselves, most probably we were run as `sh COMMAND'
+ # in which case we are not to be found in the path.
+ if test "x$as_myself" = x; then
+ as_myself=$0
+ fi
+ if test ! -f "$as_myself"; then
+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
+ { (exit 1); exit 1; }; }
+ fi
+ case $CONFIG_SHELL in
+ '')
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for as_base in sh bash ksh sh5; do
+ case $as_dir in
+ /*)
+ if ("$as_dir/$as_base" -c '
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
+ CONFIG_SHELL=$as_dir/$as_base
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$0" ${1+"$@"}
+ fi;;
+ esac
+ done
+done
+;;
+ esac
+
+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+ # uniformly replaced by the line number. The first 'sed' inserts a
+ # line-number line before each line; the second 'sed' does the real
+ # work. The second script uses 'N' to pair each line-number line
+ # with the numbered line, and appends trailing '-' during
+ # substitution so that $LINENO is not a special case at line end.
+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-)
+ sed '=' <$as_myself |
+ sed '
+ N
+ s,$,-,
+ : loop
+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
+ t loop
+ s,-$,,
+ s,^['$as_cr_digits']*\n,,
+ ' >$as_me.lineno &&
+ chmod +x $as_me.lineno ||
+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { (exit 1); exit 1; }; }
+
+ # Don't try to exec as it changes $[0], causing all sort of problems
+ # (the dirname of $[0] is not the place where we might find the
+ # original and so on. Autoconf is especially sensible to this).
+ . ./$as_me.lineno
+ # Exit status is that of the last command.
+ exit
+}
+
+
+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
+ *c*,-n*) ECHO_N= ECHO_C='
+' ECHO_T=' ' ;;
+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;;
+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;;
+esac
+
+if expr a : '\(a\)' >/dev/null 2>&1; then
+ as_expr=expr
+else
+ as_expr=false
+fi
+
+rm -f conf$$ conf$$.exe conf$$.file
+echo >conf$$.file
+if ln -s conf$$.file conf$$ 2>/dev/null; then
+ # We could just check for DJGPP; but this test a) works b) is more generic
+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
+ if test -f conf$$.exe; then
+ # Don't use ln at all; we don't have any links
+ as_ln_s='cp -p'
+ else
+ as_ln_s='ln -s'
+ fi
+elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+else
+ as_ln_s='cp -p'
+fi
+rm -f conf$$ conf$$.exe conf$$.file
+
+if mkdir -p . 2>/dev/null; then
+ as_mkdir_p=:
+else
+ as_mkdir_p=false
+fi
+
+as_executable_p="test -f"
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.
+as_nl='
+'
+IFS=" $as_nl"
+
+# CDPATH.
+$as_unset CDPATH
+
+
+# Name of the host.
+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+# so uname gets run too.
+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+
+exec 6>&1
+
+#
+# Initializations.
+#
+ac_default_prefix=/usr/local
+ac_config_libobj_dir=.
+cross_compiling=no
+subdirs=
+MFLAGS=
+MAKEFLAGS=
+SHELL=${CONFIG_SHELL-/bin/sh}
+
+# Maximum number of lines to put in a shell here document.
+# This variable seems obsolete. It should probably be removed, and
+# only ac_max_sed_lines should be used.
+: ${ac_max_here_lines=38}
+
+# Identity of this package.
+PACKAGE_NAME=
+PACKAGE_TARNAME=
+PACKAGE_VERSION=
+PACKAGE_STRING=
+PACKAGE_BUGREPORT=
+
+ac_unique_file="ccm-tools-bundle.spec.in"
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE RELEASE LIBOBJS LTLIBOBJS'
+ac_subst_files=''
+
+# Initialize some variables set by options.
+ac_init_help=
+ac_init_version=false
+# The variables have the same names as the options, with
+# dashes changed to underlines.
+cache_file=/dev/null
+exec_prefix=NONE
+no_create=
+no_recursion=
+prefix=NONE
+program_prefix=NONE
+program_suffix=NONE
+program_transform_name=s,x,x,
+silent=
+site=
+srcdir=
+verbose=
+x_includes=NONE
+x_libraries=NONE
+
+# Installation directory options.
+# These are left unexpanded so users can "make install exec_prefix=/foo"
+# and all the variables that are supposed to be based on exec_prefix
+# by default will actually change.
+# Use braces instead of parens because sh, perl, etc. also accept them.
+bindir='${exec_prefix}/bin'
+sbindir='${exec_prefix}/sbin'
+libexecdir='${exec_prefix}/libexec'
+datadir='${prefix}/share'
+sysconfdir='${prefix}/etc'
+sharedstatedir='${prefix}/com'
+localstatedir='${prefix}/var'
+libdir='${exec_prefix}/lib'
+includedir='${prefix}/include'
+oldincludedir='/usr/include'
+infodir='${prefix}/info'
+mandir='${prefix}/man'
+
+ac_prev=
+for ac_option
+do
+ # If the previous option needs an argument, assign it.
+ if test -n "$ac_prev"; then
+ eval "$ac_prev=\$ac_option"
+ ac_prev=
+ continue
+ fi
+
+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+
+ # Accept the important Cygnus configure options, so we can diagnose typos.
+
+ case $ac_option in
+
+ -bindir | --bindir | --bindi | --bind | --bin | --bi)
+ ac_prev=bindir ;;
+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
+ bindir=$ac_optarg ;;
+
+ -build | --build | --buil | --bui | --bu)
+ ac_prev=build_alias ;;
+ -build=* | --build=* | --buil=* | --bui=* | --bu=*)
+ build_alias=$ac_optarg ;;
+
+ -cache-file | --cache-file | --cache-fil | --cache-fi \
+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
+ ac_prev=cache_file ;;
+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
+ cache_file=$ac_optarg ;;
+
+ --config-cache | -C)
+ cache_file=config.cache ;;
+
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
+ datadir=$ac_optarg ;;
+
+ -disable-* | --disable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ eval "enable_$ac_feature=no" ;;
+
+ -enable-* | --enable-*)
+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ { (exit 1); exit 1; }; }
+ ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+ eval "enable_$ac_feature='$ac_optarg'" ;;
+
+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
+ | --exec | --exe | --ex)
+ ac_prev=exec_prefix ;;
+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
+ | --exec=* | --exe=* | --ex=*)
+ exec_prefix=$ac_optarg ;;
+
+ -gas | --gas | --ga | --g)
+ # Obsolete; use --with-gas.
+ with_gas=yes ;;
+
+ -help | --help | --hel | --he | -h)
+ ac_init_help=long ;;
+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
+ ac_init_help=recursive ;;
+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
+ ac_init_help=short ;;
+
+ -host | --host | --hos | --ho)
+ ac_prev=host_alias ;;
+ -host=* | --host=* | --hos=* | --ho=*)
+ host_alias=$ac_optarg ;;
+
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir=$ac_optarg ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir=$ac_optarg ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ libdir=$ac_optarg ;;
+
+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+ | --libexe | --libex | --libe)
+ ac_prev=libexecdir ;;
+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir=$ac_optarg ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ localstatedir=$ac_optarg ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir=$ac_optarg ;;
+
+ -nfp | --nfp | --nf)
+ # Obsolete; use --without-fp.
+ with_fp=no ;;
+
+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \
+ | --no-cr | --no-c | -n)
+ no_create=yes ;;
+
+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \
+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
+ no_recursion=yes ;;
+
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir=$ac_optarg ;;
+
+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
+ ac_prev=prefix ;;
+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
+ prefix=$ac_optarg ;;
+
+ -program-prefix | --program-prefix | --program-prefi | --program-pref \
+ | --program-pre | --program-pr | --program-p)
+ ac_prev=program_prefix ;;
+ -program-prefix=* | --program-prefix=* | --program-prefi=* \
+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
+ program_prefix=$ac_optarg ;;
+
+ -program-suffix | --program-suffix | --program-suffi | --program-suff \
+ | --program-suf | --program-su | --program-s)
+ ac_prev=program_suffix ;;
+ -program-suffix=* | --program-suffix=* | --program-suffi=* \
+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
+ program_suffix=$ac_optarg ;;
+
+ -program-transform-name | --program-transform-name \
+ | --program-transform-nam | --program-transform-na \
+ | --program-transform-n | --program-transform- \
+ | --program-transform | --program-transfor \
+ | --program-transfo | --program-transf \
+ | --program-trans | --program-tran \
+ | --progr-tra | --program-tr | --program-t)
+ ac_prev=program_transform_name ;;
+ -program-transform-name=* | --program-transform-name=* \
+ | --program-transform-nam=* | --program-transform-na=* \
+ | --program-transform-n=* | --program-transform-=* \
+ | --program-transform=* | --program-transfor=* \
+ | --program-transfo=* | --program-transf=* \
+ | --program-trans=* | --program-tran=* \
+ | --progr-tra=* | --program-tr=* | --program-t=*)
+ program_transform_name=$ac_optarg ;;
+
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir=$ac_optarg ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir=$ac_optarg ;;
+
+ -site | --site | --sit)
+ ac_prev=site ;;
+ -site=* | --site=* | --sit=*)
+ site=$ac_optarg ;;
+
+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
+ ac_prev=srcdir ;;
+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
+ srcdir=$ac_optarg ;;
+
+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+ | --syscon | --sysco | --sysc | --sys | --sy)
+ ac_prev=sysconfdir ;;
+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+ sysconfdir=$ac_optarg ;;
+
+ -target | --target | --targe | --targ | --tar | --ta | --t)
+ ac_prev=target_alias ;;
+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
+ target_alias=$ac_optarg ;;
+
+ -v | -verbose | --verbose | --verbos | --verbo | --verb)
+ verbose=yes ;;
+
+ -version | --version | --versio | --versi | --vers | -V)
+ ac_init_version=: ;;
+
+ -with-* | --with-*)
+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package| sed 's/-/_/g'`
+ case $ac_option in
+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
+ *) ac_optarg=yes ;;
+ esac
+ eval "with_$ac_package='$ac_optarg'" ;;
+
+ -without-* | --without-*)
+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid package name: $ac_package" >&2
+ { (exit 1); exit 1; }; }
+ ac_package=`echo $ac_package | sed 's/-/_/g'`
+ eval "with_$ac_package=no" ;;
+
+ --x)
+ # Obsolete; use --with-x.
+ with_x=yes ;;
+
+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
+ | --x-incl | --x-inc | --x-in | --x-i)
+ ac_prev=x_includes ;;
+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
+ x_includes=$ac_optarg ;;
+
+ -x-libraries | --x-libraries | --x-librarie | --x-librari \
+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
+ ac_prev=x_libraries ;;
+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+ x_libraries=$ac_optarg ;;
+
+ -*) { echo "$as_me: error: unrecognized option: $ac_option
+Try \`$0 --help' for more information." >&2
+ { (exit 1); exit 1; }; }
+ ;;
+
+ *=*)
+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+ # Reject names that are not valid shell variable names.
+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { (exit 1); exit 1; }; }
+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
+ eval "$ac_envvar='$ac_optarg'"
+ export $ac_envvar ;;
+
+ *)
+ # FIXME: should be removed in autoconf 3.0.
+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+ ;;
+
+ esac
+done
+
+if test -n "$ac_prev"; then
+ ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+ { echo "$as_me: error: missing argument to $ac_option" >&2
+ { (exit 1); exit 1; }; }
+fi
+
+# Be sure to have absolute paths.
+for ac_var in exec_prefix prefix
+do
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
+ esac
+done
+
+# Be sure to have absolute paths.
+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
+ localstatedir libdir includedir oldincludedir infodir mandir
+do
+ eval ac_val=$`echo $ac_var`
+ case $ac_val in
+ [\\/$]* | ?:[\\/]* ) ;;
+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { (exit 1); exit 1; }; };;
+ esac
+done
+
+# There might be people who depend on the old broken behavior: `$host'
+# used to hold the argument of --host etc.
+# FIXME: To remove some day.
+build=$build_alias
+host=$host_alias
+target=$target_alias
+
+# FIXME: To remove some day.
+if test "x$host_alias" != x; then
+ if test "x$build_alias" = x; then
+ cross_compiling=maybe
+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ If a cross compiler is detected then cross compile mode will be used." >&2
+ elif test "x$build_alias" != "x$host_alias"; then
+ cross_compiling=yes
+ fi
+fi
+
+ac_tool_prefix=
+test -n "$host_alias" && ac_tool_prefix=$host_alias-
+
+test "$silent" = yes && exec 6>/dev/null
+
+
+# Find the source files, if location was not specified.
+if test -z "$srcdir"; then
+ ac_srcdir_defaulted=yes
+ # Try the directory containing this script, then its parent.
+ ac_confdir=`(dirname "$0") 2>/dev/null ||
+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$0" : 'X\(//\)[^/]' \| \
+ X"$0" : 'X\(//\)$' \| \
+ X"$0" : 'X\(/\)' \| \
+ . : '\(.\)' 2>/dev/null ||
+echo X"$0" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+ /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+ /^X\(\/\/\)$/{ s//\1/; q; }
+ /^X\(\/\).*/{ s//\1/; q; }
+ s/.*/./; q'`
+ srcdir=$ac_confdir
+ if test ! -r $srcdir/$ac_unique_file; then
+ srcdir=..
+ fi
+else
+ ac_srcdir_defaulted=no
+fi
+if test ! -r $srcdir/$ac_unique_file; then
+ if test "$ac_srcdir_defaulted" = yes; then
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
+ { (exit 1); exit 1; }; }
+ else
+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { (exit 1); exit 1; }; }
+ fi
+fi
+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
+ { (exit 1); exit 1; }; }
+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
+ac_env_build_alias_set=${build_alias+set}
+ac_env_build_alias_value=$build_alias
+ac_cv_env_build_alias_set=${build_alias+set}
+ac_cv_env_build_alias_value=$build_alias
+ac_env_host_alias_set=${host_alias+set}
+ac_env_host_alias_value=$host_alias
+ac_cv_env_host_alias_set=${host_alias+set}
+ac_cv_env_host_alias_value=$host_alias
+ac_env_target_alias_set=${target_alias+set}
+ac_env_target_alias_value=$target_alias
+ac_cv_env_target_alias_set=${target_alias+set}
+ac_cv_env_target_alias_value=$target_alias
+
+#
+# Report the --help message.
+#
+if test "$ac_init_help" = "long"; then
+ # Omit some internal or obsolete options to make the list less imposing.
+ # This message is too long to be a string in the A/UX 3.1 sh.
+ cat <<_ACEOF
+\`configure' configures this package to adapt to many kinds of systems.
+
+Usage: $0 [OPTION]... [VAR=VALUE]...
+
+To assign environment variables (e.g., CC, CFLAGS...), specify them as
+VAR=VALUE. See below for descriptions of some of the useful variables.
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+ -h, --help display this help and exit
+ --help=short display options specific to this package
+ --help=recursive display the short help of all the included packages
+ -V, --version display version information and exit
+ -q, --quiet, --silent do not print \`checking...' messages
+ --cache-file=FILE cache test results in FILE [disabled]
+ -C, --config-cache alias for \`--cache-file=config.cache'
+ -n, --no-create do not create output files
+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
+
+_ACEOF
+
+ cat <<_ACEOF
+Installation directories:
+ --prefix=PREFIX install architecture-independent files in PREFIX
+ [$ac_default_prefix]
+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
+ [PREFIX]
+
+By default, \`make install' will install all the files in
+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
+for instance \`--prefix=\$HOME'.
+
+For better control, use the options below.
+
+Fine tuning of the installation directories:
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --infodir=DIR info documentation [PREFIX/info]
+ --mandir=DIR man documentation [PREFIX/man]
+_ACEOF
+
+ cat <<\_ACEOF
+
+Program names:
+ --program-prefix=PREFIX prepend PREFIX to installed program names
+ --program-suffix=SUFFIX append SUFFIX to installed program names
+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names
+_ACEOF
+fi
+
+if test -n "$ac_init_help"; then
+
+ cat <<\_ACEOF
+
+_ACEOF
+fi
+
+if test "$ac_init_help" = "recursive"; then
+ # If there are subdirs, report their specific --help.
+ ac_popdir=`pwd`
+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
+ test -d $ac_dir || continue
+ ac_builddir=.
+
+if test "$ac_dir" != .; then
+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ # A "../" for each directory in $ac_dir_suffix.
+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
+else
+ ac_dir_suffix= ac_top_builddir=
+fi
+
+case $srcdir in
+ .) # No --srcdir option. We are building in place.
+ ac_srcdir=.
+ if test -z "$ac_top_builddir"; then
+ ac_top_srcdir=.
+ else
+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
+ fi ;;
+ [\\/]* | ?:[\\/]* ) # Absolute path.
+ ac_srcdir=$srcdir$ac_dir_suffix;
+ ac_top_srcdir=$srcdir ;;
+ *) # Relative path.
+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
+ ac_top_srcdir=$ac_top_builddir$srcdir ;;
+esac
+# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be
+# absolute.
+ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
+ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
+ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
+ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+ cd $ac_dir
+ # Check for guested configure; otherwise get Cygnus style configure.
+ if test -f $ac_srcdir/configure.gnu; then
+ echo
+ $SHELL $ac_srcdir/configure.gnu --help=recursive
+ elif test -f $ac_srcdir/configure; then
+ echo
+ $SHELL $ac_srcdir/configure --help=recursive
+ elif test -f $ac_srcdir/configure.ac ||
+ test -f $ac_srcdir/configure.in; then
+ echo
+ $ac_configure --help
+ else
+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ fi
+ cd $ac_popdir
+ done
+fi
+
+test -n "$ac_init_help" && exit 0
+if $ac_init_version; then
+ cat <<\_ACEOF
+
+Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
+Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+_ACEOF
+ exit 0
+fi
+exec 5>config.log
+cat >&5 <<_ACEOF
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by $as_me, which was
+generated by GNU Autoconf 2.57. Invocation command line was
+
+ $ $0 $@
+
+_ACEOF
+{
+cat <<_ASUNAME
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown`
+
+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
+hostinfo = `(hostinfo) 2>/dev/null || echo unknown`
+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown`
+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown`
+
+_ASUNAME
+
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ echo "PATH: $as_dir"
+done
+
+} >&5
+
+cat >&5 <<_ACEOF
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+_ACEOF
+
+
+# Keep a trace of the command line.
+# Strip out --no-create and --no-recursion so they do not pile up.
+# Strip out --silent because we don't want to record it for future runs.
+# Also quote any args containing shell meta-characters.
+# Make two passes to allow for proper duplicate-argument suppression.
+ac_configure_args=
+ac_configure_args0=
+ac_configure_args1=
+ac_sep=
+ac_must_keep_next=false
+for ac_pass in 1 2
+do
+ for ac_arg
+ do
+ case $ac_arg in
+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+ | -silent | --silent | --silen | --sile | --sil)
+ continue ;;
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ case $ac_pass in
+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
+ 2)
+ ac_configure_args1="$ac_configure_args1 '$ac_arg'"
+ if test $ac_must_keep_next = true; then
+ ac_must_keep_next=false # Got value, back to normal.
+ else
+ case $ac_arg in
+ *=* | --config-cache | -C | -disable-* | --disable-* \
+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+ | -with-* | --with-* | -without-* | --without-* | --x)
+ case "$ac_configure_args0 " in
+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+ esac
+ ;;
+ -* ) ac_must_keep_next=true ;;
+ esac
+ fi
+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
+ # Get rid of the leading space.
+ ac_sep=" "
+ ;;
+ esac
+ done
+done
+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
+
+# When interrupted or exit'd, cleanup temporary files, and complete
+# config.log. We remove comments because anyway the quotes in there
+# would cause problems or look ugly.
+# WARNING: Be sure not to use single quotes in there, as some shells,
+# such as our DU 5.0 friend, will then `close' the trap.
+trap 'exit_status=$?
+ # Save into config.log some information that might help in debugging.
+ {
+ echo
+
+ cat <<\_ASBOX
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+_ASBOX
+ echo
+ # The following way of writing the cache mishandles newlines in values,
+{
+ (set) 2>&1 |
+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
+ *ac_space=\ *)
+ sed -n \
+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
+ ;;
+ *)
+ sed -n \
+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
+ ;;
+ esac;
+}
+ echo
+
+ cat <<\_ASBOX
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+_ASBOX
+ echo
+ for ac_var in $ac_subst_vars
+ do
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
+ done | sort
+ echo
+
+ if test -n "$ac_subst_files"; then
+ cat <<\_ASBOX
+## ------------- ##
+## Output files. ##
+## ------------- ##
+_ASBOX
+ echo
+ for ac_var in $ac_subst_files
+ do
+ eval ac_val=$`echo $ac_var`
+ echo "$ac_var='"'"'$ac_val'"'"'"
+ done | sort
+ echo
+ fi
+
+ if test -s confdefs.h; then
+ cat <<\_ASBOX
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+_ASBOX
+ echo
+ sed "/^$/d" confdefs.h | sort
+ echo
+ fi
+ test "$ac_signal" != 0 &&
+ echo "$as_me: caught signal $ac_signal"
+ echo "$as_me: exit $exit_status"
+ } >&5
+ rm -f core core.* *.core &&
+ rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
+ exit $exit_status
+ ' 0
+for ac_signal in 1 2 13 15; do
+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
+done
+ac_signal=0
+
+# confdefs.h avoids OS command line length limits that DEFS can exceed.
+rm -rf conftest* confdefs.h
+# AIX cpp loses on an empty file, so make sure it contains at least a newline.
+echo >confdefs.h
+
+# Predefined preprocessor variables.
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_NAME "$PACKAGE_NAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION "$PACKAGE_VERSION"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_STRING "$PACKAGE_STRING"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+_ACEOF
+
+
+# Let the site file select an alternate cache file if it wants to.
+# Prefer explicitly selected file to automatically selected ones.
+if test -z "$CONFIG_SITE"; then
+ if test "x$prefix" != xNONE; then
+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+ else
+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+ fi
+fi
+for ac_site_file in $CONFIG_SITE; do
+ if test -r "$ac_site_file"; then
+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+echo "$as_me: loading site script $ac_site_file" >&6;}
+ sed 's/^/| /' "$ac_site_file" >&5
+ . "$ac_site_file"
+ fi
+done
+
+if test -r "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special
+ # files actually), so we avoid doing that.
+ if test -f "$cache_file"; then
+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5
+echo "$as_me: loading cache $cache_file" >&6;}
+ case $cache_file in
+ [\\/]* | ?:[\\/]* ) . $cache_file;;
+ *) . ./$cache_file;;
+ esac
+ fi
+else
+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5
+echo "$as_me: creating cache $cache_file" >&6;}
+ >$cache_file
+fi
+
+# Check that the precious variables saved in the cache have kept the same
+# value.
+ac_cache_corrupted=false
+for ac_var in `(set) 2>&1 |
+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
+ eval ac_new_set=\$ac_env_${ac_var}_set
+ eval ac_old_val="\$ac_cv_env_${ac_var}_value"
+ eval ac_new_val="\$ac_env_${ac_var}_value"
+ case $ac_old_set,$ac_new_set in
+ set,)
+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,set)
+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ ac_cache_corrupted=: ;;
+ ,);;
+ *)
+ if test "x$ac_old_val" != "x$ac_new_val"; then
+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
+echo "$as_me: former value: $ac_old_val" >&2;}
+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
+echo "$as_me: current value: $ac_new_val" >&2;}
+ ac_cache_corrupted=:
+ fi;;
+ esac
+ # Pass precious variables to config.status.
+ if test "$ac_new_set" = set; then
+ case $ac_new_val in
+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *) ac_arg=$ac_var=$ac_new_val ;;
+ esac
+ case " $ac_configure_args " in
+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
+ esac
+ fi
+done
+if $ac_cache_corrupted; then
+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+VERSION=1.0.0
+RELEASE=5
+
+ac_aux_dir=
+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+ if test -f $ac_dir/install-sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install-sh -c"
+ break
+ elif test -f $ac_dir/install.sh; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/install.sh -c"
+ break
+ elif test -f $ac_dir/shtool; then
+ ac_aux_dir=$ac_dir
+ ac_install_sh="$ac_aux_dir/shtool install -c"
+ break
+ fi
+done
+if test -z "$ac_aux_dir"; then
+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+ac_config_guess="$SHELL $ac_aux_dir/config.guess"
+ac_config_sub="$SHELL $ac_aux_dir/config.sub"
+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
+
+# Find a good install program. We prefer a C program (faster),
+# so one script is as good as another. But avoid the broken or
+# incompatible versions:
+# SysV /etc/install, /usr/sbin/install
+# SunOS /usr/etc/install
+# IRIX /sbin/install
+# AIX /bin/install
+# AmigaOS /C/install, which installs bootblocks on floppy discs
+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# ./install, which can be erroneously created by make from ./install.sh.
+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
+if test -z "$INSTALL"; then
+if test "${ac_cv_path_install+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in
+ ./ | .// | /cC/* | \
+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+ /usr/ucb/* ) ;;
+ *)
+ # OSF1 and SCO ODT 3.0 have their own names for install.
+ # Don't use installbsd from OSF since it installs stuff as root
+ # by default.
+ for ac_prog in ginstall scoinst install; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+ if test $ac_prog = install &&
+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # AIX install. It has an incompatible calling convention.
+ :
+ elif test $ac_prog = install &&
+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+ # program-specific install script used by HP pwplus--don't use.
+ :
+ else
+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+ break 3
+ fi
+ fi
+ done
+ done
+ ;;
+esac
+done
+
+
+fi
+ if test "${ac_cv_path_install+set}" = set; then
+ INSTALL=$ac_cv_path_install
+ else
+ # As a last resort, use the slow shell script. We don't cache a
+ # path for INSTALL within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the path is relative.
+ INSTALL=$ac_install_sh
+ fi
+fi
+echo "$as_me:$LINENO: result: $INSTALL" >&5
+echo "${ECHO_T}$INSTALL" >&6
+
+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+# It thinks the first close brace ends the variable substitution.
+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+
+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+
+echo "$as_me:$LINENO: checking whether build environment is sane" >&5
+echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
+# Just in case
+sleep 1
+echo timestamp > conftestfile
+# Do `set' in a subshell so we don't clobber the current shell's
+# arguments. Must try -L first in case configure is actually a
+# symlink; some systems play weird games with the mod time of symlinks
+# (eg FreeBSD returns the mod time of the symlink's containing
+# directory).
+if (
+ set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+ if test "$*" = "X"; then
+ # -L didn't work.
+ set X `ls -t $srcdir/configure conftestfile`
+ fi
+ if test "$*" != "X $srcdir/configure conftestfile" \
+ && test "$*" != "X conftestfile $srcdir/configure"; then
+
+ # If neither matched, then we have a broken ls. This can happen
+ # if, for instance, CONFIG_SHELL is bash and it inherits a
+ # broken ls alias from the environment. This has actually
+ # happened. Such a system could not be considered "sane".
+ { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&5
+echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken
+alias in your environment" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ test "$2" = conftestfile
+ )
+then
+ # Ok.
+ :
+else
+ { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+Check your system clock" >&5
+echo "$as_me: error: newly created file is older than distributed files!
+Check your system clock" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+rm -f conftest*
+echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+test "$program_prefix" != NONE &&
+ program_transform_name="s,^,$program_prefix,;$program_transform_name"
+# Use a double $ so make ignores it.
+test "$program_suffix" != NONE &&
+ program_transform_name="s,\$,$program_suffix,;$program_transform_name"
+# Double any \ or $. echo might interpret backslashes.
+# By default was `s,x,x', remove it if useless.
+cat <<\_ACEOF >conftest.sed
+s/[\\$]/&&/g;s/;s,x,x,$//
+_ACEOF
+program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
+rm conftest.sed
+
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.make <<\_ACEOF
+all:
+ @echo 'ac_maketemp="$(MAKE)"'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+ eval ac_cv_prog_make_${ac_make}_set=yes
+else
+ eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+PACKAGE=ccm-tools-bundle
+
+VERSION=$VERSION
+
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+ { (exit 1); exi...
[truncated message content] |
|
From: <mb...@re...> - 2004-11-05 23:51:02
|
Author: mbooth
Date: 2004-11-06 00:43:55 +0100 (Sat, 06 Nov 2004)
New Revision: 88
Modified:
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java
Log:
Don't throw an error if the user isn't logged in.
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java 2004-11-05 23:43:05 UTC (rev 87)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/TemplateEmailListener.java 2004-11-05 23:43:55 UTC (rev 88)
@@ -18,26 +18,24 @@
*/
package com.arsdigita.formbuilder.actions;
+import com.arsdigita.formbuilder.PersistentProcessListener;
import com.arsdigita.formbuilder.util.Placeholders;
+import com.arsdigita.bebop.FormProcessException;
+import com.arsdigita.bebop.event.FormProcessListener;
+import com.arsdigita.bebop.event.FormSectionEvent;
+import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.OID;
-import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.metadata.ObjectType;
import com.arsdigita.domain.DataObjectNotFoundException;
-
-import com.arsdigita.bebop.FormProcessException;
-import com.arsdigita.bebop.event.FormSectionEvent;
-
+import com.arsdigita.kernel.Kernel;
+import com.arsdigita.kernel.User;
import com.arsdigita.mail.Mail;
+import com.arsdigita.web.Web;
-import com.arsdigita.formbuilder.PersistentProcessListener;
-import com.arsdigita.formbuilder.util.Placeholders;
-
import java.math.BigDecimal;
import javax.mail.MessagingException;
-import com.arsdigita.util.UncheckedWrapperException;
-import com.arsdigita.bebop.event.FormProcessListener;
public class TemplateEmailListener extends PersistentProcessListener {
public static final String BASE_DATA_OBJECT_TYPE =
@@ -156,17 +154,23 @@
Placeholders p = new Placeholders(e.getPageState(),
e.getFormData());
- String to = p.interpolate(m_to);
+ String from;
+ User user = (User) Kernel.getContext().getParty();
+ if( null == user ) {
+ from = "notloggedinuser@" +
+ Web.getConfig().getServer().getName();
+ } else {
+ from = user.getPrimaryEmail().getEmailAddress();
+ }
+
String subject = p.interpolate(m_subject);
String body = p.interpolate(m_body);
- //String from = p.interpolate("::user.givenname:: ::user.familyname:: <::user.email::>");
- String from = p.interpolate("::user.email::");
try {
- Mail message = new Mail(to, from, subject, body);
+ Mail message = new Mail(m_to, from, subject, body);
message.send();
} catch (MessagingException ex) {
- throw new UncheckedWrapperException("cannot send message", ex);
+ throw new FormProcessException( "cannot send message", ex );
}
}
}
|
|
From: <mb...@re...> - 2004-11-05 23:50:12
|
Author: mbooth
Date: 2004-11-06 00:43:05 +0100 (Sat, 06 Nov 2004)
New Revision: 87
Modified:
ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java
Log:
Don't try to send an email confirmation to the user if they're not logged in.
Modified: ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java
===================================================================
--- ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java 2004-11-05 23:42:14 UTC (rev 86)
+++ ccm-core/trunk/src/com/arsdigita/formbuilder/actions/ConfirmEmailListener.java 2004-11-05 23:43:05 UTC (rev 87)
@@ -18,29 +18,32 @@
*/
package com.arsdigita.formbuilder.actions;
+import com.arsdigita.formbuilder.PersistentProcessListener;
+import com.arsdigita.formbuilder.util.Placeholders;
+
+import com.arsdigita.bebop.FormProcessException;
+import com.arsdigita.bebop.event.FormSectionEvent;
+import com.arsdigita.bebop.event.FormProcessListener;
+import com.arsdigita.domain.DataObjectNotFoundException;
+import com.arsdigita.kernel.Kernel;
+import com.arsdigita.kernel.User;
+import com.arsdigita.mail.Mail;
import com.arsdigita.persistence.OID;
import com.arsdigita.persistence.DataObject;
import com.arsdigita.persistence.metadata.ObjectType;
-import com.arsdigita.domain.DataObjectNotFoundException;
-import com.arsdigita.bebop.FormProcessException;
-import com.arsdigita.bebop.event.FormSectionEvent;
-
-import com.arsdigita.formbuilder.PersistentProcessListener;
-import com.arsdigita.formbuilder.util.Placeholders;
-
import java.math.BigDecimal;
-import com.arsdigita.formbuilder.util.Placeholders;
-import com.arsdigita.mail.Mail;
import javax.mail.MessagingException;
-import com.arsdigita.bebop.event.FormProcessListener;
-import com.arsdigita.util.UncheckedWrapperException;
+import org.apache.log4j.Logger;
public class ConfirmEmailListener extends PersistentProcessListener {
public static final String BASE_DATA_OBJECT_TYPE =
"com.arsdigita.formbuilder.actions.ConfirmEmailListener";
+ private static final Logger s_log =
+ Logger.getLogger( ConfirmEmailListener.class );
+
public static final String FROM = "from";
public static final String SUBJECT = "subject";
public static final String BODY = "body";
@@ -152,17 +155,22 @@
Placeholders p = new Placeholders(e.getPageState(),
e.getFormData());
+ User user = (User) Kernel.getContext().getParty();
+ if( null == user ) {
+ s_log.info( "User not logged in. Not sending confirmation" );
+ return;
+ }
+
String from = p.interpolate(m_from);
String subject = p.interpolate(m_subject);
String body = p.interpolate(m_body);
- //String to = p.interpolate("::user.givenname:: ::user.familyname:: <::user.email::>");
- String to = p.interpolate("::user.email::");
+ String to = user.getPrimaryEmail().getEmailAddress();
try {
Mail message = new Mail(to, from, subject, body);
message.send();
} catch (MessagingException ex) {
- throw new UncheckedWrapperException("cannot send message", ex);
+ throw new FormProcessException("cannot send message", ex);
}
}
}
|
18 messages has been excluded from this view by a project administrator.
