Context Navigation

Changeset 108 for branches/omero

Timestamp:

06/13/05 15:51:24 (4 years ago)

Author:

jmoore

Message:

* Split out clients data source configuration for easier picking
* Updated Help in maven.xml

Location:

branches/omero

Files:

r102	r108
3	3	<configs>
4	4	<config>test/org/openmicroscopy/omero/client/itests/test.xml</config>
	5	<config>test/org/openmicroscopy/omero/client/itests/data.xml</config>
5	6	<config>src/org/openmicroscopy/omero/client/spring.xml</config>
6	7	</configs>

r104	r108
70	70	*/
71	71	protected String[] getConfigLocations() {
72		return new String[]{"org/openmicroscopy/omero/client/spring.xml",
73		"org/openmicroscopy/omero/client/itests/test.xml"};
	72	return new String[]{
	73	"org/openmicroscopy/omero/client/spring.xml",
	74	"org/openmicroscopy/omero/client/itests/test.xml",
	75	"org/openmicroscopy/omero/client/itests/data.xml"
	76	};
74	77	}
75	78

r104	r108
47	47	<property name="dataSource" ref="dataSource"/>
48	48	</bean>
49
50		~~<bean id="dataSource"~~
51		~~class="org.springframework.jdbc.datasource.DriverManagerDataSource">~~
52		~~<property name="driverClassName"><value>${database.driver}</value></property>~~
53		~~<property name="url"><value>${database.url}</value></property>~~
54		~~<property name="username"><value>${database.username}</value></property>~~
55		~~<property name="password"><value>${database.password}</value></property>~~
56		~~</bean>~~
57	49
58	50	</beans>

r104	r108
64	64	*/
65	65	protected String[] getConfigLocations() {
66		return new String[] { "org/openmicroscopy/omero/client/spring.xml",
67		"org/openmicroscopy/omero/client/itests/test.xml" };
	66	return new String[] {
	67	"org/openmicroscopy/omero/client/spring.xml",
	68	"org/openmicroscopy/omero/client/itests/data.xml" };
68	69	}
69	70

r107	r108
2	2	<project xmlns:j="jelly:core" xmlns:ant="jelly:ant"
3	3	xmlns:maven="jelly:maven" xmlns:u="jelly:util" default="help">
	4
	5	<!-- HELP -->
	6	<goal name="help">
	7	<ant:echo></ant:echo>
	8	<ant:echo>********************************************************</ant:echo>
	9	<ant:echo> Omero Build System:</ant:echo>
	10	<ant:echo> -------------------</ant:echo>
	11	<ant:echo> Goals: (e.g. "maven GOAL")</ant:echo>
	12	<ant:echo> help -- This file</ant:echo>
	13	<ant:echo> build -- Compile to target and package </ant:echo>
	14	<ant:echo> install -- Add dependencies to your repository </ant:echo>
	15	<ant:echo> test -- Run all tests (see test mode below)</ant:echo>
	16	<ant:echo> clean -- Remove all generated items </ant:echo>
	17	<ant:echo> </ant:echo>
	18	<ant:echo> Properties: (e.g. "maven -DPROPERTY=VALUE")</ant:echo>
	19	<ant:echo> maven.test.mode={integration\|unit} (Now: ${maven.test.mode})</ant:echo>
	20	<ant:echo></ant:echo>
	21	<ant:echo>********************************************************</ant:echo>
	22	<ant:echo> For more information, see http://maven.apache.org</ant:echo>
	23	<ant:echo></ant:echo>
	24	</goal>
4	25
5	26	<!-- Dependencies -->