Home

Main Menu

MP4 mini tutorial

Subversion repository

Subversion Repository

Navigation

← Previous Changeset
Next Changeset →

Changeset 24

Timestamp:

12/21/07 14:11:16 (9 months ago)

Author:

sip

Message:

Profile and Mixer add/remove

Files:

mcuWeb/build.xml (modified) (3 diffs)
mcuWeb/nbproject/ant-deploy.xml (modified) (1 diff)
mcuWeb/nbproject/build-impl.xml (modified) (34 diffs)
mcuWeb/nbproject/genfiles.properties (modified) (1 diff)
mcuWeb/nbproject/project.properties (modified) (3 diffs)
mcuWeb/nbproject/project.xml (modified) (1 diff)
mcuWeb/src/java/org/murillo/mcuWeb/ConferenceMngr.java (modified) (3 diffs)
mcuWeb/src/java/org/murillo/mcuWeb/MCUHttpServlet.java (modified) (5 diffs)
mcuWeb/src/java/org/murillo/mcuWeb/MediaMixer.java (modified) (2 diffs)
mcuWeb/web/createConference.jsp (modified) (3 diffs)
mcuWeb/web/index.jsp (modified) (4 diffs)

Legend:

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

mcuWeb/build.xml

r14	r24
22	22	-pre-compile-test-single: called before javac compilation of single JUnit test
23	23	-post-compile-test-single: called after javac compilation of single JUunit test
24		-pre-dist: called before ~~jar~~ building
25		-post-dist: called after ~~jar~~ building
	24	-pre-dist: called before archive building
	25	-post-dist: called after archive building
26	26	-post-clean: called after cleaning build products
27	27	-pre-run-deploy: called before deploying
…	…
30	30	Example of pluging an obfuscator after the compilation could look like
31	31
32		<target name="post-compile">
	32	<target name="-post-compile">
33	33	<obfuscate>
34	34	<fileset dir="${build.classes.dir}"/>
…	…
46	46	init-macrodef-junit: defines macro for junit execution
47	47	init-macrodef-debug: defines macro for class debugging
48		do-dist: ~~jar~~ archive building
	48	do-dist: archive building
49	49	run: execution of project
50	50	javadoc-build: javadoc generation

mcuWeb/nbproject/ant-deploy.xml

r14	r24
31	31	<mkdir dir="${sjsas.resources.dir}/META-INF"/>
32	32	<property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
33		<property name="lefty" value="<"/>
34
35		<property name="righty" value=">"/>
36		<concat destfile="${sjsas.resources.file}">${lefty}?xml version="1.0" encoding="UTF-8"?${righty}
37		${lefty}!DOCTYPE resources PUBLIC
38		"-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
39		"${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty}
40		${lefty}resources${righty}
41		${lefty}/resources${righty}
42		</concat>
43		<concat append="true" destfile="${sjsas.resources.file}">
	33	<copy todir="${sjsas.resources.dir}/META-INF">
44	34	<fileset dir="${deploy.ant.resource.dir}"/>
45		</concat>
46		<replace file="${sjsas.resources.file}" value="">
47		<replacetoken><![CDATA[</resources>
48		<?xml version="1.0" encoding="UTF-8"?>
49		<resources>]]></replacetoken>
50		</replace>
51		<replace file="${sjsas.resources.file}" value="">
52		<replacetoken><![CDATA[</resources>
53		<?xml version="1.0" encoding="UTF-8"?>
54		<resources>]]></replacetoken>
55		</replace>
56		<replace file="${sjsas.resources.file}" value="">
57		<replacetoken><![CDATA[transaction-isolation-level="JDBC Driver Default"]]></replacetoken>
58		</replace>
59		<!-- work-around 434 and its variants -->
60		<replace file="${sjsas.resources.file}" value="">
61		<replacetoken><![CDATA[<description/>]]></replacetoken>
62		</replace>
63		<!-- do the right thing for Topics and Queues.
64		Need fix for TopicConnectionFactory and QueueConnectionfactory -->
65		<replace file="${sjsas.resources.file}">
66		<replacetoken><![CDATA[<jms-resource ]]></replacetoken>
67		<replacevalue><![CDATA[<admin-object-resource res-adapter="jmsra" ]]></replacevalue>
68		</replace>
69		<replace file="${sjsas.resources.file}">
70		<replacetoken><![CDATA[</jms-resource>]]></replacetoken>
71		<replacevalue><![CDATA[</admin-object-resource>]]></replacevalue>
72		</replace>
	35	</copy>
73	36	<jar destfile="${deploy.ant.archive}" update="true">
74	37	<fileset dir="${sjsas.resources.dir}"/>

mcuWeb/nbproject/build-impl.xml

r14	r24
18	18
19	19	-->
20		<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="build" name="mcuWeb-impl">
21		<import file="extendArchiveGF.xml"/>
	20	<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="mcuWeb-impl">
22	21	<import file="ant-deploy.xml"/>
23	22	<target depends="dist,javadoc" description="Build whole project." name="default"/>
…	…
42	41	<property file="nbproject/project.properties"/>
43	42	</target>
44		<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init">
45		<property name="build.meta.inf.dir" value="${build.ear.web.dir}/META-INF"/>
46		<property name="build.classes.dir.real" value="${build.ear.classes.dir}"/>
47		<property name="build.web.dir.real" value="${build.ear.web.dir}"/>
48		</target>
	43	<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
49	44	<target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-do-ear-init" name="-do-init">
50	45	<condition property="have.tests">
…	…
88	83	<available file="${conf.dir}/persistence.xml" property="has.persistence.xml"/>
89	84	<condition property="do.war.package.with.custom.manifest">
	85	<isset property="has.custom.manifest"/>
	86	</condition>
	87	<condition property="do.war.package.without.custom.manifest">
	88	<not>
	89	<isset property="has.custom.manifest"/>
	90	</not>
	91	</condition>
	92	<condition property="do.tmp.war.package.with.custom.manifest">
90	93	<and>
91		~~<istrue value="${war.package}"/>~~
92	94	<isset property="has.custom.manifest"/>
	95	<isfalse value="${directory.deployment.supported}"/>
93	96	</and>
94	97	</condition>
95		<condition property="do.war.package.without.custom.manifest">
	98	<condition property="do.tmp.war.package.without.custom.manifest">
96	99	<and>
97		~~<istrue value="${war.package}"/>~~
98	100	<not>
99	101	<isset property="has.custom.manifest"/>
100	102	</not>
	103	<isfalse value="${directory.deployment.supported}"/>
101	104	</and>
102	105	</condition>
103	106	<property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
104		~~<property name="build.classes.dir.real" value="${build.classes.dir}"/>~~
105		~~<property name="build.web.dir.real" value="${build.web.dir}"/>~~
106	107	<condition else="" property="application.args.param" value="${application.args}">
107	108	<and>
…	…
113	114	</condition>
114	115	<property name="source.encoding" value="${file.encoding}"/>
	116	<condition property="javadoc.encoding.used" value="${javadoc.encoding}">
	117	<and>
	118	<isset property="javadoc.encoding"/>
	119	<not>
	120	<equals arg1="${javadoc.encoding}" arg2=""/>
	121	</not>
	122	</and>
	123	</condition>
	124	<property name="javadoc.encoding.used" value="${source.encoding}"/>
115	125	</target>
116	126	<target name="-post-init">
…	…
144	154	<macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
145	155	<attribute default="${src.dir}" name="srcdir"/>
146		<attribute default="${build.classes.dir~~.real~~}" name="destdir"/>
	156	<attribute default="${build.classes.dir}" name="destdir"/>
147	157	<attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
148	158	<attribute default="${javac.debug}" name="debug"/>
149		<attribute default="~~${jaxws.endorsed.dir}" name="jaxwsendorsed~~"/>
	159	<attribute default="" name="javac.compilerargs.jaxws"/>
150	160	<element name="customize" optional="true"/>
151	161	<sequential>
…	…
154	164	<path path="@{classpath}"/>
155	165	</classpath>
156		<compilerarg line="-Djava.endorsed.dirs='@{jaxwsendorsed}'"/>
157		<compilerarg line="${javac.compilerargs}"/>
	166	<compilerarg line="${javac.compilerargs} @{javac.compilerargs.jaxws}"/>
158	167	<customize/>
159	168	</javac>
…	…
190	199	<jvmarg line="${runmain.jvmargs}"/>
191	200	<classpath>
192		<path path="${~~build.classes.dir.real}:${javac.classpath}:${j2ee.platform~~.classpath}"/>
	201	<path path="${debug.classpath}"/>
193	202	</classpath>
194	203	<syspropertyset>
…	…
214	223	</macrodef>
215	224	<macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
216		<attribute default="${build.classes.dir~~.real~~}" name="dir"/>
	225	<attribute default="${build.classes.dir}" name="dir"/>
217	226	<sequential>
218	227	<nbjpdareload>
…	…
241	250	<attribute default="${debug.classpath}" name="classpath"/>
242	251	<attribute default="${application.args.param}" name="args"/>
	252	<element name="customize" optional="true"/>
243	253	<sequential>
244	254	<java classname="@{classname}" fork="true">
…	…
254	264	</syspropertyset>
255	265	<arg line="@{args}"/>
	266	<customize/>
256	267	</java>
257	268	</sequential>
…	…
269	280	<contains casesensitive="false" string="${tld.files.path_@{propname}}" substring=".tld"/>
270	281	</condition>
271		<condition property="copy.to.dir_@{propname}" value="${build.web.dir~~.real~~}/WEB-INF/lib">
	282	<condition property="copy.to.dir_@{propname}" value="${build.web.dir}/WEB-INF/lib">
272	283	<isset property="hastlds_@{propname}"/>
273	284	</condition>
…	…
297	308	<target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
298	309	<target depends="init,deps-jar" name="-pre-pre-compile">
299		<mkdir dir="${build.classes.dir~~.real~~}"/>
	310	<mkdir dir="${build.classes.dir}"/>
300	311	</target>
301	312	<target name="-pre-compile">
…	…
304	315	</target>
305	316	<target name="-copy-webdir">
306		<copy todir="${build.web.dir~~.real~~}">
	317	<copy todir="${build.web.dir}">
307	318	<fileset dir="${web.docbase.dir}" excludes="${build.web.excludes}"/>
308	319	</copy>
309		<copy todir="${build.web.dir~~.real~~}/WEB-INF">
	320	<copy todir="${build.web.dir}/WEB-INF">
310	321	<fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
311	322	</copy>
312	323	</target>
313	324	<target if="rest.support.on" name="-init-rest">
314		<taskdef classname="com.sun.ws.rest.tools.ant.RestBeansProcessorTask" name="restapt">
	325	<condition property="platform.restlib.classpath" value="${j2ee.platform.classpath}">
	326	<and>
	327	<isset property="restlib.ignore.platform"/>
	328	<isfalse value="${restlib.ignore.platform}"/>
	329	</and>
	330	</condition>
	331	<taskdef classname="com.sun.ws.rest.tools.ant.WebResourcesProcessorTask" name="restapt">
315	332	<classpath>
316		<path path="${j2ee.platform.classpath}"/>
	333	<path path="${platform.restlib.classpath}"/>
	334	<path path="${libs.restlib.classpath}"/>
317	335	</classpath>
318	336	</taskdef>
…	…
323	341	<classpath>
324	342	<path path="${javac.classpath}"/>
325		<path path="${libs.jaxws20.classpath}"/>
	343	<path path="${libs.jaxws21.classpath}"/>
326	344	<path path="${j2ee.platform.classpath}"/>
327	345	<pathelement location="${build.web.dir}/WEB-INF/classes"/>
…	…
331	349	</source>
332	350	</restapt>
333		<webproject2:javac destdir="${build.classes.dir~~.real~~}" srcdir="${build.generated.dir}/rest-gen"/>
334		<copy todir="${build.classes.dir~~.real~~}">
	351	<webproject2:javac destdir="${build.classes.dir}" srcdir="${build.generated.dir}/rest-gen"/>
	352	<copy todir="${build.classes.dir}">
335	353	<fileset dir="${build.generated.dir}/rest-gen" includes="*/.wadl"/>
336	354	</copy>
…	…
338	356	<target name="-do-ws-compile"/>
339	357	<target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest,-do-ws-compile" if="have.sources" name="-do-compile">
340		<webproject2:javac destdir="${build.classes.dir~~.real~~}"/>
341		<copy todir="${build.classes.dir~~.real~~}">
	358	<webproject2:javac destdir="${build.classes.dir}"/>
	359	<copy todir="${build.classes.dir}">
342	360	<fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
343	361	</copy>
…	…
350	368	</target>
351	369	<target if="has.persistence.xml" name="-copy-persistence-xml">
352		<mkdir dir="${build.web.dir~~.real~~}/WEB-INF/classes/META-INF"/>
353		<copy todir="${build.web.dir~~.real~~}/WEB-INF/classes/META-INF">
	370	<mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
	371	<copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
354	372	<fileset dir="${conf.dir}" includes="persistence.xml"/>
355	373	</copy>
…	…
371	389	</customize>
372	390	</webproject2:javac>
373		<copy todir="${build.classes.dir~~.real~~}">
	391	<copy todir="${build.classes.dir}">
374	392	<fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
375	393	</copy>
…	…
384	402	<java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
385	403	<arg value="-uriroot"/>
386		<arg file="${basedir}/${build.web.dir~~.real~~}"/>
	404	<arg file="${basedir}/${build.web.dir}"/>
387	405	<arg value="-d"/>
388	406	<arg file="${basedir}/${build.generated.dir}/src"/>
…	…
391	409	</java>
392	410	<mkdir dir="${build.generated.dir}/classes"/>
393		<webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir~~.real~~}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
	411	<webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
394	412	</target>
395	413	<target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
…	…
398	416	<java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
399	417	<arg value="-uriroot"/>
400		<arg file="${basedir}/${build.web.dir~~.real~~}"/>
	418	<arg file="${basedir}/${build.web.dir}"/>
401	419	<arg value="-d"/>
402	420	<arg file="${basedir}/${build.generated.dir}/src"/>
…	…
407	425	</java>
408	426	<mkdir dir="${build.generated.dir}/classes"/>
409		<webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir~~.real~~}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
	427	<webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
410	428	<customize>
411	429	<patternset includes="${javac.jsp.includes}"/>
…	…
420	438	DIST BUILDING SECTION
421	439	-->
422		<target ~~depends="-extend-archive"~~ name="-pre-dist">
	440	<target name="-pre-dist">
423	441	<!-- Empty placeholder for easier customization. -->
424	442	<!-- You can override this target in the ../build.xml file. -->
…	…
428	446	<mkdir dir="${dist.jar.dir}"/>
429	447	<jar compress="${jar.compress}" jarfile="${dist.war}">
430		<fileset dir="${build.web.dir~~.real~~}"/>
	448	<fileset dir="${build.web.dir}"/>
431	449	</jar>
432	450	</target>
…	…
435	453	<mkdir dir="${dist.jar.dir}"/>
436	454	<jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
437		<fileset dir="${build.web.dir.real}"/>
	455	<fileset dir="${build.web.dir}"/>
	456	</jar>
	457	</target>
	458	<target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
	459	<dirname file="${dist.war}" property="dist.jar.dir"/>
	460	<mkdir dir="${dist.jar.dir}"/>
	461	<jar compress="${jar.compress}" jarfile="${dist.war}">
	462	<fileset dir="${build.web.dir}"/>
	463	</jar>
	464	</target>
	465	<target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
	466	<dirname file="${dist.war}" property="dist.jar.dir"/>
	467	<mkdir dir="${dist.jar.dir}"/>
	468	<jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
	469	<fileset dir="${build.web.dir}"/>
438	470	</jar>
439	471	</target>
…	…
462	494	<basename file="${file.reference.ws-commons-util-1.0.1.jar}" property="included.lib.file.reference.ws-commons-util-1.0.1.jar"/>
463	495	<copy-ear-war file="${file.reference.ws-commons-util-1.0.1.jar}" propname="included.lib.file.reference.ws-commons-util-1.0.1.jar.X"/>
464		<copy file="${file.reference.xmlrpc-client-3.0rc1-sources.jar}" todir="${build.web.dir~~.real~~}/"/>
465		<copy file="${file.reference.xmlrpc-client-3.0rc1.jar}" todir="${build.web.dir~~.real~~}/"/>
466		<copy file="${file.reference.xmlrpc-common-3.0rc1-sources.jar}" todir="${build.web.dir~~.real~~}/"/>
467		<copy file="${file.reference.xmlrpc-common-3.0rc1.jar}" todir="${build.web.dir~~.real~~}/"/>
468		<copy file="${file.reference.xmlrpc-server-3.0rc1-sources.jar}" todir="${build.web.dir~~.real~~}/"/>
469		<copy file="${file.reference.xmlrpc-server-3.0rc1.jar}" todir="${build.web.dir~~.real~~}/"/>
470		<copy file="${file.reference.commons-logging-1.0.4.jar}" todir="${build.web.dir~~.real~~}/"/>
471		<copy file="${file.reference.ws-commons-java5-1.0.1.jar}" todir="${build.web.dir~~.real~~}/"/>
472		<copy file="${file.reference.ws-commons-util-1.0.1.jar}" todir="${build.web.dir~~.real~~}/"/>
473		<mkdir dir="${build.web.dir~~.real~~}/META-INF"/>
474		<manifest file="${build.web.dir~~.real~~}/META-INF/MANIFEST.MF" mode="update">
	496	<copy file="${file.reference.xmlrpc-client-3.0rc1-sources.jar}" todir="${build.web.dir}/"/>
	497	<copy file="${file.reference.xmlrpc-client-3.0rc1.jar}" todir="${build.web.dir}/"/>
	498	<copy file="${file.reference.xmlrpc-common-3.0rc1-sources.jar}" todir="${build.web.dir}/"/>
	499	<copy file="${file.reference.xmlrpc-common-3.0rc1.jar}" todir="${build.web.dir}/"/>
	500	<copy file="${file.reference.xmlrpc-server-3.0rc1-sources.jar}" todir="${build.web.dir}/"/>
	501	<copy file="${file.reference.xmlrpc-server-3.0rc1.jar}" todir="${build.web.dir}/"/>
	502	<copy file="${file.reference.commons-logging-1.0.4.jar}" todir="${build.web.dir}/"/>
	503	<copy file="${file.reference.ws-commons-java5-1.0.1.jar}" todir="${build.web.dir}/"/>
	504	<copy file="${file.reference.ws-commons-util-1.0.1.jar}" todir="${build.web.dir}/"/>
	505	<mkdir dir="${build.web.dir}/META-INF"/>
	506	<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
475	507	<attribute name="Class-Path" value="${included.lib.libs.siplibrary.classpath} ${included.lib.file.reference.XmlRpcMcuClient.jar} ${included.lib.file.reference.xmlrpc-client-3.0rc1-sources.jar} ${included.lib.file.reference.xmlrpc-client-3.0rc1.jar} ${included.lib.file.reference.xmlrpc-common-3.0rc1-sources.jar} ${included.lib.file.reference.xmlrpc-common-3.0rc1.jar} ${included.lib.file.reference.xmlrpc-server-3.0rc1-sources.jar} ${included.lib.file.reference.xmlrpc-server-3.0rc1.jar} ${included.lib.file.reference.commons-logging-1.0.4.jar} ${included.lib.file.reference.ws-commons-java5-1.0.1.jar} ${included.lib.file.reference.ws-commons-util-1.0.1.jar} "/>
476	508	</manifest>
…	…
478	510	</target>
479	511	<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
480		<copy file="${libs.siplibrary.classpath}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
481		<copy file="${file.reference.XmlRpcMcuClient.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
482		<copy file="${file.reference.xmlrpc-client-3.0rc1-sources.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
483		<copy file="${file.reference.xmlrpc-client-3.0rc1.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
484		<copy file="${file.reference.xmlrpc-common-3.0rc1-sources.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
485		<copy file="${file.reference.xmlrpc-common-3.0rc1.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
486		<copy file="${file.reference.xmlrpc-server-3.0rc1-sources.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
487		<copy file="${file.reference.xmlrpc-server-3.0rc1.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
488		<copy file="${file.reference.commons-logging-1.0.4.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
489		<copy file="${file.reference.ws-commons-java5-1.0.1.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
490		<copy file="${file.reference.ws-commons-util-1.0.1.jar}" todir="${build.web.dir~~.real~~}/WEB-INF/lib"/>
491		<copy file="${file.reference.xmlrpc-client-3.0rc1-sources.jar}" todir="${build.web.dir~~.real~~}/"/>
492		<copy file="${file.reference.xmlrpc-client-3.0rc1.jar}" todir="${build.web.dir~~.real~~}/"/>
493		<copy file="${file.reference.xmlrpc-common-3.0rc1-sources.jar}" todir="${build.web.dir~~.real~~}/"/>
494		<copy file="${file.reference.xmlrpc-common-3.0rc1.jar}" todir="${build.web.dir~~.real~~}/"/>
495		<copy file="${file.reference.xmlrpc-server-3.0rc1-sources.jar}" todir="${build.web.dir~~.real~~}/"/>
496		<copy file="${file.reference.xmlrpc-server-3.0rc1.jar}" todir="${build.web.dir~~.real~~}/"/>
497		<copy file="${file.reference.commons-logging-1.0.4.jar}" todir="${build.web.dir~~.real~~}/"/>
498		<copy file="${file.reference.ws-commons-java5-1.0.1.jar}" todir="${build.web.dir~~.real~~}/"/>
499		<copy file="${file.reference.ws-commons-util-1.0.1.jar}" todir="${build.web.dir~~.real~~}/"/>
	512	<copy file="${libs.siplibrary.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
	513	<copy file="${file.reference.XmlRpcMcuClient.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	514	<copy file="${file.reference.xmlrpc-client-3.0rc1-sources.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	515	<copy file="${file.reference.xmlrpc-client-3.0rc1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	516	<copy file="${file.reference.xmlrpc-common-3.0rc1-sources.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	517	<copy file="${file.reference.xmlrpc-common-3.0rc1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	518	<copy file="${file.reference.xmlrpc-server-3.0rc1-sources.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	519	<copy file="${file.reference.xmlrpc-server-3.0rc1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	520	<copy file="${file.reference.commons-logging-1.0.4.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	521	<copy file="${file.reference.ws-commons-java5-1.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	522	<copy file="${file.reference.ws-commons-util-1.0.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
	523	<copy file="${file.reference.xmlrpc-client-3.0rc1-sources.jar}" todir="${build.web.dir}/"/>
	524	<copy file="${file.reference.xmlrpc-client-3.0rc1.jar}" todir="${build.web.dir}/"/>
	525	<copy file="${file.reference.xmlrpc-common-3.0rc1-sources.jar}" todir="${build.web.dir}/"/>
	526	<copy file="${file.reference.xmlrpc-common-3.0rc1.jar}" todir="${build.web.dir}/"/>
	527	<copy file="${file.reference.xmlrpc-server-3.0rc1-sources.jar}" todir="${build.web.dir}/"/>
	528	<copy file="${file.reference.xmlrpc-server-3.0rc1.jar}" todir="${build.web.dir}/"/>
	529	<copy file="${file.reference.commons-logging-1.0.4.jar}" todir="${build.web.dir}/"/>
	530	<copy file="${file.reference.ws-commons-java5-1.0.1.jar}" todir="${build.web.dir}/"/>
	531	<copy file="${file.reference.ws-commons-util-1.0.1.jar}" todir="${build.web.dir}/"/>
500	532	</target>
501	533	<target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
502	534	<dirname file="${dist.ear.war}" property="dist.jar.dir"/>
503	535	<mkdir dir="${dist.jar.dir}"/>
504		<jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir~~.real~~}/META-INF/MANIFEST.MF">
505		<fileset dir="${build.web.dir~~.real~~}"/>
	536	<jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
	537	<fileset dir="${build.web.dir}"/>
506	538	</jar>
507	539	</target>
…	…
535	567	<!-- Task to deploy to the Access Manager runtime. -->
536	568	</target>
537		<target depends="init,compile,compile-jsps,-do-compile-single-jsp,dist,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy"/>
	569	<target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy"/>
538	570	<target if="netbeans.home" name="-run-deploy-nb">
539	571	<nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
…	…
549	581	<fail message="Undeploy is not supported from within the IDE"/>
550	582	</target>
551		<target depends="init,dist" name="verify">
	583	<target depends="init,-pre-dist,dist,-post-dist" name="verify">
552	584	<nbverify file="${dist.war}"/>
553	585	</target>
…	…
624	656	DEBUGGING SECTION
625	657	-->
626		<target depends="init,compile,compile-jsps,-do-compile-single-jsp,dist" description="Debug project in IDE." if="netbeans.home" name="debug">
	658	<target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
627	659	<nbdeploy clientUrlPart="${client.urlPart}" debugmode="true"/>
628	660	<antcall target="connect-debugger"/>
…	…
664	696	<target depends="init" name="javadoc-build">
665	697	<mkdir dir="${dist.javadoc.dir}"/>
666		<javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" ~~destdir="${dist.javadoc.dir~~}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
	698	<javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="${javadoc.encoding.used}" destdir="${dist.javadoc.dir}" docencoding="${javadoc.encoding.used}" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
667	699	<classpath>
668	700	<path path="${javac.classpath}:${j2ee.platform.classpath}"/>
…	…
754	786	<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
755	787	<fail unless="test.class">Must select one file in the IDE or set test.class</fail>
756		<webproject1:debug args="${test.class}" classname="junit.textui.TestRunner" classpath="${debug.test.classpath}"/>
	788	<property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
	789	<delete file="${test.report.file}"/>
	790	<!-- must exist, otherwise the XML formatter would fail -->
	791	<mkdir dir="${build.test.results.dir}"/>
	792	<webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
	793	<customize>
	794	<arg value="showoutput=true"/>
	795	<arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
	796	<arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
	797	</customize>
	798	</webproject1:debug>
757	799	</target>
758	800	<target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
…	…
770	812	<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
771	813	<target depends="init" name="do-clean">
772		<condition property="build.dir.to.clean" value="${build.web.dir~~.real~~}">
	814	<condition property="build.dir.to.clean" value="${build.web.dir}">
773	815	<isset property="dist.ear.dir"/>
774	816	</condition>
775		<property name="build.dir.to.clean" value="${build.web.dir~~.real~~}"/>
	817	<property name="build.dir.to.clean" value="${build.web.dir}"/>
776	818	<delete includeEmptyDirs="true" quiet="true">
777	819	<fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
…	…
782	824	</target>
783	825	<target depends="do-clean" if="status.clean-failed" name="check-clean">
784		<echo message="Warning: unable to delete some files in ${build.web.dir~~.real~~}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
	826	<echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
785	827	<echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
786	828	</target>

mcuWeb/nbproject/genfiles.properties

r14	r24
1		build.xml.data.CRC32=~~2704dbd7~~
2		build.xml.script.CRC32=~~758a60c~~3
3		build.xml.stylesheet.CRC32=~~e4ec34a3~~
	1	build.xml.data.CRC32=b2747cfa
	2	build.xml.script.CRC32=09075733
	3	build.xml.stylesheet.CRC32=cfd7ba16
4	4	# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
5	5	# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
6		nbproject/build-impl.xml.data.CRC32=~~2704dbd7~~
7		nbproject/build-impl.xml.script.CRC32=~~369c3172~~
8		nbproject/build-impl.xml.stylesheet.CRC32=~~13df24ff~~
	6	nbproject/build-impl.xml.data.CRC32=b2747cfa
	7	nbproject/build-impl.xml.script.CRC32=b0f47a55
	8	nbproject/build-impl.xml.stylesheet.CRC32=4db110bd

mcuWeb/nbproject/project.properties

r14	r24
2	2	build.classes.excludes=*/.java,*/.form
3	3	build.dir=build
4		~~build.ear.classes.dir=${build.ear.web.dir}/WEB-INF/classes~~
5		~~build.ear.web.dir=${build.dir}/web~~
6	4	build.generated.dir=${build.dir}/generated
7	5	build.test.classes.dir=${build.dir}/test/classes
…	…
12	10	compile.jsps=false
13	11	conf.dir=${source.root}/conf
14		debug.classpath=${javac.classpath}:${build.classes.dir}:${~~build.ear.classes.dir~~}
	12	debug.classpath=${javac.classpath}:${build.classes.dir}:${j2ee.platform.classpath}
15	13	debug.test.classpath=\
16	14	${run.test.classpath}
…	…
32	30	file.reference.XmlRpcMcuClient.jar=../XmlRpcMcuClient/dist/XmlRpcMcuClient.jar
33	31	j2ee.platform=1.5
34		j2ee.server.type=~~SJSAS~~
	32	j2ee.server.type=J2EE
35	33	jar.compress=false
36	34	javac.classpath=\

mcuWeb/nbproject/project.xml

r14	r24
3	3	<type>org.netbeans.modules.web.project</type>
4	4	<configuration>
5		<buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1">
6		<extension file="extendArchiveGF.xml" id="gfarchiveextend">
7		<dependency dependsOn="-extend-archive" target="-pre-dist"/>
8		</extension>
9		</buildExtensions>
	5	<buildExtensions xmlns="http://www.netbeans.org/ns/ant-build-extender/1"/>
10	6	<data xmlns="http://www.netbeans.org/ns/web-project/3">
11	7	<name>mcuWeb</name>

mcuWeb/src/java/org/murillo/mcuWeb/ConferenceMngr.java

r23	r24
88	88	return mixers;
89	89	}
90
	90
	91	public MediaMixer getMcu(String UID) {
	92	return mixers.get(UID);
	93	}
91	94	public HashMap<String, Conference> getConferences() {
92	95	return conferences;
…	…
301	304	return mixer;
302	305	}
303		public Profile addProfile(String name, Integer videoSize, Integer videoBitrate, Boolean videoBitrateStrict, Integer videoFPS, Integer videoQmin, Integer videoQmax)
304		{
	306
	307	public void removeMixer(String UID) {
	308	//Remove mixer
	309	mixers.remove(UID);
	310	}
	311
	312	public Profile addProfile(String name, Integer videoSize, Integer videoBitrate, Boolean videoBitrateStrict, Integer videoFPS, Integer videoQmin, Integer videoQmax) {
305	313	//Create Profile
306	314	Profile profile = new Profile(name, videoSize, videoBitrate, videoBitrateStrict, videoFPS, videoQmin, videoQmax);
…	…
309	317	//Exit
310	318	return profile;
	319	}
	320
	321	public void removeProfile(String uid) {
	322	//Remove profile
	323	profiles.remove(uid);
311	324	}
312	325

mcuWeb/src/java/org/murillo/mcuWeb/MCUHttpServlet.java

r23	r24
62	62	}
63	63	//Set initial media mixers
64		try {
	64	try {
65	65	//Set mm
66	66	confMngr.addMixer("Ubuntu Box","http://192.168.1.5:8080/mcu","192.168.1.5");
…	…
137	137	//Redirect
138	138	response.sendRedirect("/mcuWeb/conference.jsp?uid=" + uid);
139
	139	} else if (method.equals("addProfile")) {
	140	//Get parameters
	141	String name = request.getParameter("name");
	142	Integer videoSize = Integer.parseInt(request.getParameter("videoSize"));
	143	Integer videoBitrate = Integer.parseInt(request.getParameter("videoBitrate"));
	144	Integer videoFPS = Integer.parseInt(request.getParameter("videoFPS"));
	145	Integer videoQmin = Integer.parseInt(request.getParameter("videoQmin"));
	146	Integer videoQmax = Integer.parseInt(request.getParameter("videoQmax"));
	147	//Call
	148	addProfile(name,videoSize,videoBitrate,true,videoFPS,videoQmin,videoQmax);
	149	//Redirect
	150	response.sendRedirect("/mcuWeb");
	151	} else if (method.equals("removeProfile")) {
	152	//Get parameters
	153	String uid = request.getParameter("uid");
	154	//Call
	155	removeProfile(uid);
	156	//Redirect
	157	response.sendRedirect("/mcuWeb");
140	158	} else if (method.equals("addMixer")) {
141	159	//Get parameters
…	…
145	163	//Call
146	164	addMixer(name,url,ip);
	165	//Redirect
	166	response.sendRedirect("/mcuWeb");
	167	} else if (method.equals("removeMixer")) {
	168	//Get parameters
	169	String uid = request.getParameter("uid");
	170	//Call
	171	removeMixer(uid);
147	172	//Redirect
148	173	response.sendRedirect("/mcuWeb");
…	…
187	212	}
188	213
	214	private void removeMixer(String uid) {
	215	//Get the list of conferences
	216	Iterator<Conference> it = confMngr.getConferences().values().iterator();
	217	//For each one
	218	while(it.hasNext())
	219	{
	220	//Get conference
	221	Conference conf = it.next();
	222	//If it in the mixer
	223	if (conf.getMixer().getUID().equals(uid))
	224	try {
	225	//Remove conference
	226	removeConference(conf.getUID());
	227	} catch (Exception e) {
	228	e.printStackTrace();
	229	}
	230	}
	231	//Remove mixer
	232	confMngr.removeMixer(uid);
	233	}
	234
189	235	private Conference createConference(String name, String did, String mixerId, Integer compType,String profileId) {
190	236	//Create conference
…	…
235	281	confMngr.removeConference(uid);
236	282	}
237
	283
238	284	private void setCompositionType(String confId, Integer compType, Integer size, String profileId) {
239	285	//Set composition type
240	286	confMngr.setCompositionType(confId,compType,size,profileId);
241	287	}
242
	288
	289	private void addProfile(String name, Integer videoSize, Integer videoBitrate, Boolean videoBitrateStrict, Integer videoFPS, Integer videoQmin, Integer videoQmax) {
	290	//Create profile
	291	confMngr.addProfile(name,videoSize,videoBitrate,videoBitrateStrict,videoFPS,videoQmin,videoQmax);
	292	}
	293
	294	private void removeProfile(String uid) {
	295	//Remvoe profile
	296	confMngr.removeProfile(uid);
	297	}
243	298	}

mcuWeb/src/java/org/murillo/mcuWeb/MediaMixer.java

r23	r24
20	20	package org.murillo.mcuWeb;
21	21	import java.net.MalformedURLException;
	22	import java.util.HashMap;
22	23	import org.murillo.mcu.XmlRpcMcuClient;
23	24	/**
…	…
56	57	return name+"@"+url;
57	58	}
	59
	60	public static HashMap<Integer,String> getSizes() {
	61	//The map
	62	HashMap<Integer,String> sizes = new HashMap<Integer,String>();
	63	//Add values
	64	sizes.put(QCIF,"QCIF");
	65	sizes.put(CIF,"QCIF");
	66	//Return map
	67	return sizes;
	68	}
	69
	70	public static HashMap<Integer,String> getAudioCodecs() {
	71	//The map
	72	HashMap<Integer,String> codecs = new HashMap<Integer,String>();
	73	//Add values
	74	codecs.put(PCMU,"PCMU");
	75	codecs.put(PCMA,"PCMA");
	76	codecs.put(GSM,"GSM");
	77	//Return map
	78	return codecs;
	79	}
	80
	81	public static HashMap<Integer,String> getVideoCodecs() {
	82	//The map
	83	HashMap<Integer,String> codecs = new HashMap<Integer,String>();
	84	//Add values
	85	codecs.put(H261,"H261");
	86	codecs.put(H263_1996,"H263-1996");
	87	codecs.put(H263_1998,"H263-1998");
	88	codecs.put(H263_1998,"H263-2000");
	89	codecs.put(MPEG4,"MPEG4");
	90	//Return map
	91	return codecs;
	92	}
	93
	94	public static HashMap<Integer,String> getMosaics() {
	95	//The map
	96	HashMap<Integer,String> mosaics = new HashMap<Integer,String>();
	97	//Add values
	98	mosaics.put(MOSAIC1x1,"MOSAIC1x1");
	99	mosaics.put(MOSAIC2x2,"MOSAIC2x2");
	100	mosaics.put(MOSAIC3x3,"MOSAIC3x3");
	101	//Return map
	102	return mosaics;
	103	}
	104
58	105	}

mcuWeb/web/createConference.jsp

r23	r24
2	2	<%@page pageEncoding="UTF-8"%>
3	3	<%@page import="java.util.Iterator"%>
	4	<%@page import="java.util.HashMap"%>
4	5	<jsp:useBean id="confMngr" class="org.murillo.mcuWeb.ConferenceMngr" scope="application" />
5	6	<fieldset>
…	…
33	34	<td>Composition:</td>
34	35	<td><select name="compType">
35		<option value="0">Mosaic 1x1
36		<option value="1" selected>Mosaic 2x2
37		<option value="2">Mosaic 3x3
	36	<%
	37	//Get mosaics
	38	java.util.HashMap<Integer,String> mosaics = org.murillo.mcuWeb.MediaMixer.getMosaics();
	39	//Get iterator
	40	Iterator<java.lang.Integer> itMosaics = mosaics.keySet().iterator();
	41	//Loop
	42	while(itMosaics.hasNext()) {
	43	//Get key and value
	44	Integer k = itMosaics.next();
	45	String v = mosaics.get(k);
	46	%><option value="<%=k%>"><%=v%><%
	47