Changeset Navigation

← Previous Changeset
Next Changeset →

Changeset 2048

Timestamp:

01/28/09 12:13:28

Author:

douglm

Message:

Fixes to install script, some docs and address widget

Files:

trunk/build/dirTools.xml (modified) (3 diffs)
trunk/build/quickstart/linux/install (modified) (2 diffs)
trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkAttendees.js (modified) (1 diff)
trunk/docs/quickstart.odt (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/build/dirTools.xml

r2046	r2048
12	12	================================================================= -->
13	13
14		<target name="initDir" depends="init"
15		description="Build and run directory init">
16		<antfetch antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
17		target="initDir"
18		return="org.bedework.directory.init.status" >
19		<propertyset>
20		<propertyref prefix="org.bedework.directory."/>
21		</propertyset>
22		<property name="org.bedework.libcache.dir"
23		location="${org.bedework.project.bedework}/libcache"/>
24		</antfetch>
25		</target>
26
27		<target name="initDirForQuickstart" depends="init.build,build.rpiutil"
28		description="Build and run directory tool to initialise a quickstart system">
29		<antfetch antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
30		target="initDirForQuickstart"
31		return="org.bedework.directory.init.status" >
32		<propertyset>
33		<propertyref prefix="org.bedework.directory."/>
34		</propertyset>
35		<property name="org.bedework.libcache.dir"
36		location="${org.bedework.project.bedework}/libcache"/>
37		</antfetch>
38		</target>
39
40		<target name="addUser" depends="init"
41		description="Run directory tools to add a user">
42		<!--
43		<loadDeployConfig />
44		-->
	14	<target name="dirToolInit" depends="init">
45	15	<property name="app.dest.classes"
46	16	location="${dist.home}/temp/dirTool/classes" />
…	…
63	33	refid="run.classpath"
64	34	targetos="unix" pathsep=":" />
	35	</target>
65	36
	37	<target name="initDir" depends="init"
	38	description="Build and run directory init">
	39	<antfetch antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
	40	target="initDir"
	41	return="org.bedework.directory.init.status" >
	42	<propertyset>
	43	<propertyref prefix="org.bedework.directory."/>
	44	</propertyset>
	45	<property name="org.bedework.libcache.dir"
	46	location="${org.bedework.project.bedework}/libcache"/>
	47	</antfetch>
	48	</target>
	49
	50	<target name="initDirForQuickstart" depends="dirToolInit"
	51	description="Build and run directory tool to initialise a quickstart system">
66	52	<java classname="org.bedework.tools.directory.DirTool"
67	53	fork="true"
68	54	failonerror="false"
69		resultproperty="org.bedework.cmdutil.status" >
	55	resultproperty="org.bedework.dirtool.status" >
	56	<classpath refid="run.classpath" />
	57	<arg value="-clean-for-quickstart" />
	58	</java>
	59	</target>
	60
	61	<target name="addUser" depends="dirToolInit"
	62	description="Run directory tools to add a user">
	63	<java classname="org.bedework.tools.directory.DirTool"
	64	fork="true"
	65	failonerror="false"
	66	resultproperty="org.bedework.dirtool.status" >
70	67	<classpath refid="run.classpath" />
71	68	<arg value="-addUser" />
…	…
75	72	<arg value="${org.bedework.directory.caladdr}" />
76	73	<arg value="${org.bedework.directory.password}" />
77		~~<!-- <jvmarg value="-agentlib:yjpagent" /> -->~~
78	74	</java>
79	75	</target>
80	76
81		<target name="addGroup" depends="~~init.build,build.rpiutil~~"
	77	<target name="addGroup" depends="dirToolInit"
82	78	description="Build and run directory tools to add a group">
83		<ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
84		target="addGroup" >
85		<propertyset>
86		<propertyref prefix="org.bedework.directory."/>
87		</propertyset>
88		<property name="org.bedework.libcache.dir"
89		location="${org.bedework.project.bedework}/libcache"/>
90		</ant>
	79	<java classname="org.bedework.tools.directory.DirTool"
	80	fork="true"
	81	failonerror="false"
	82	resultproperty="org.bedework.dirtool.status" >
	83	<classpath refid="run.classpath" />
	84	<arg value="-addGroup" />
	85	<arg value="${org.bedework.directory.group}" />
	86	<arg value="${org.bedework.directory.group.member}" />
	87	</java>
91	88	</target>
92	89
93		<target name="addGroupMember" depends="~~init.build,build.rpiutil~~"
	90	<target name="addGroupMember" depends="dirToolInit"
94	91	description="Build and run directory tools to add a group member">
95		<ant antfile="${org.bedework.project.bwtools}/build.xml" inheritall="false"
96		target="addGroupMember" >
97		<propertyset>
98		<propertyref prefix="org.bedework.directory."/>
99		</propertyset>
100		<property name="org.bedework.libcache.dir"
101		location="${org.bedework.project.bedework}/libcache"/>
102		</ant>
	92	<java classname="org.bedework.tools.directory.DirTool"
	93	fork="true"
	94	failonerror="false"
	95	resultproperty="org.bedework.dirtool.status" >
	96	<classpath refid="run.classpath" />
	97	<arg value="-addGroupMember" />
	98	<arg value="${org.bedework.directory.group}" />
	99	<arg value="${org.bedework.directory.group.member}" />
	100	</java>
103	101	</target>
104	102	</project>

trunk/build/quickstart/linux/install

r2012	r2048
121	121
122	122	echo "Now we invoke the adduser script to add a superuser to the system"
123		echo "We need to know the account, first name last name and a password"
	123	echo "We need to know the account, first name, last name, the calendar address"
	124	echo "(email address) and a password"
124	125
125	126	readVal "account"
…	…
132	133	readVal "lastname"
133	134	adduser_defs="$adduser_defs -Dorg.bedework.directory.lastname=$val"
	135
	136	readVal "calendar address (email)"
	137	adduser_defs="$adduser_defs -Dorg.bedework.directory.caladdr=$val"
134	138
135	139	readVal "password"

trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkAttendees.js

r2047	r2048
97	97	matchContains: false,
98	98	autoFill: false,
	99
99	100	extraParams: {
100	101	format: 'json'
101	102	},
	103
	104	dataType: 'json',
	105
102	106	parse: function(data) {
103	107	var parsed = [];
104	108	data = data.microformats.vcard;
105	109	for (var i = 0; i < data.length; i++) {
106		parsed[parsed.length] = {
107		data: data[i],
	110	dataRow = {
	111	fn: data[i].fn.value,
	112	email: data[i].email[0].value,
	113	uri: data[i].caladruri.value,
	114	type: data[i].kind.value
	115	};
	116	parsed[i] = {
	117	data: dataRow,
108	118	value: data[i].fn.value,
109		result: data[i].mail.value };
110		}
	119	result: data[i].email[0].value
	120	};
	121	}
	122	//alert("parsedlen=" + parsed.length);
111	123	return parsed;
112	124	},
113		formatItem: function(item~~, i, max~~) {
114		~~return " \"" + item.fn.value + "\" [" + item.mail.value~~ + "]";
	125	formatItem: function(item) {
	126	return " \"" + item.fn + "\" [" + item.email + "]";
115	127	},
116		formatMatch: function(item, i, max) {
117		return item.fn.value + " " + item.mail.value;
	128
	129	formatMatch: function(item) {
	130	return " \"" + item.fn + "\" [" + item.email + "]";
118	131	},
119		formatResult: function(item~~, i, max~~) {
120		return item.~~mail.value~~;
	132	formatResult: function(item) {
	133	return item.email;
121	134	}
122	135	};
123	136
124	137	jQuery(document).ready(function($) {
125		$('#bwRaUri').autocomplete(~~entries~~, options)
	138	$('#bwRaUri').autocomplete("http://localhost:8080/ucarddav/find", options)
126	139	});
127	140

Changeset Navigation

Changeset 2048

Legend:

trunk/build/dirTools.xml

trunk/build/quickstart/linux/install

trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkAttendees.js

Download in other formats: