Skip to content

Commit 57624c1

Browse files
ghillertghillert
committed
Lots of changes - OpenId, Import/Export of master data, build improvements...
1 parent e30ba57 commit 57624c1

139 files changed

Lines changed: 12264 additions & 896 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎jrecruiter-flex/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<artifactId>jrecruiter-flex</artifactId>
1313
<packaging>swf</packaging>
1414

15-
<name>${pom.artifactId}</name>
15+
<name>${project.artifactId}</name>
1616

1717
<build>
1818
<finalName>main</finalName>
@@ -25,7 +25,7 @@
2525
<version>3.4.2</version>
2626
<extensions>true</extensions>
2727
<configuration>
28-
<sourceFile>jobs.mxml</sourceFile>
28+
<sourceFile>jobs.mxml</sourceFile>
2929
<output>${basedir}/../jrecruiter-web/src/main/webapp/fx/jobs.swf</output>
3030
<!--<services>${basedir}/../jrecruiter-web/src/main/webapp/WEB-INF/flex/services-config.xml</services>
3131
--><debug>true</debug><accessible>true</accessible><as3>true</as3><showWarnings>true</showWarnings>

‎jrecruiter-gwt/pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<groupId>org.jrecruiter</groupId>
99
<artifactId>jrecruiter-gwt</artifactId>
1010
<packaging>war</packaging>
11-
<name>${pom.artifactId}</name>
11+
<name>${project.artifactId}</name>
1212
<version>1.0</version>
1313

1414
<dependencies>
@@ -18,14 +18,14 @@
1818
<version>1.6.4</version>
1919
<scope>provided</scope>
2020
</dependency>
21-
<dependency>
22-
<groupId>org.jrecruiter</groupId>
23-
<artifactId>jrecruiter-server</artifactId>
24-
<version>2.0</version>
25-
</dependency>
21+
<dependency>
22+
<groupId>org.jrecruiter</groupId>
23+
<artifactId>jrecruiter-server</artifactId>
24+
<version>2.0</version>
25+
</dependency>
2626
</dependencies>
2727
<build>
28-
<outputDirectory>war/WEB-INF/classes</outputDirectory>
28+
<outputDirectory>war/WEB-INF/classes</outputDirectory>
2929
<plugins>
3030
<plugin>
3131
<groupId>org.apache.maven.plugins</groupId>

‎jrecruiter-server/database/alterscript.sql‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
#### 2010-Jan-02 Gunnar Hillert
3+
ALTER TABLE users ADD COLUMN USER_AUTHENTICATION_TYPE bigint;
4+
UPDATE users SET USER_AUTHENTICATION_TYPE=1;
5+
ALTER TABLE USERS ALTER COLUMN USER_AUTHENTICATION_TYPE SET NOT NULL;
6+
7+
#### 2009-Dec-22 Gunnar Hillert
8+
ALTER TABLE jobs ADD COLUMN business_Phone_Extension character varying(15);
9+
10+
#### 2009-Nov-04 Gunnar Hillert
11+
ALTER TABLE job_count_per_days ADD COLUMN automatically_cleaned boolean;
12+
UPDATE job_count_per_days
13+
SET automatically_cleaned=false
14+
ALTER TABLE job_count_per_days ALTER COLUMN automatically_cleaned SET STORAGE PLAIN;
15+
ALTER TABLE job_count_per_days ALTER COLUMN automatically_cleaned SET NOT NULL;
16+
ALTER TABLE job_count_per_days ALTER COLUMN automatically_cleaned SET DEFAULT false;
17+

‎jrecruiter-server/pom.xml‎

Lines changed: 66 additions & 167 deletions
Original file line numberDiff line numberDiff line change
@@ -54,102 +54,30 @@
5454
<useFullNames>false</useFullNames>
5555
</configuration>
5656
</plugin>
57+
5758
<plugin>
58-
<groupId>org.codehaus.mojo</groupId>
59-
<artifactId>hibernate3-maven-plugin</artifactId>
60-
<version>2.2</version>
59+
<groupId>org.apache.maven.plugins</groupId>
60+
<artifactId>maven-surefire-plugin</artifactId>
61+
<version>2.4.3</version>
6162
<configuration>
62-
<components>
63-
<component>
64-
<name>hbm2ddl</name>
65-
<implementation>jpaconfiguration</implementation>
66-
</component>
67-
</components>
68-
<componentProperties>
69-
<drop>true</drop>
70-
<jdk5>true</jdk5>
71-
<namingstrategy>org.jrecruiter.hibernate.ImprovedPluralizedNamingStrategy</namingstrategy>
72-
<propertyfile>target/classes/org/jrecruiter/server/jdbc.properties</propertyfile>
73-
<persistenceunit>base</persistenceunit>
74-
<skip>${maven.test.skip}</skip>
75-
</componentProperties>
63+
<excludes>
64+
<exclude>**/migration/*.java</exclude>
65+
</excludes>
7666
</configuration>
77-
<executions>
78-
<execution>
79-
<phase>process-test-resources</phase>
80-
<goals>
81-
<goal>hbm2ddl</goal>
82-
</goals>
83-
</execution>
84-
</executions>
85-
<dependencies>
86-
<dependency>
87-
<groupId>${jdbc.groupId}</groupId>
88-
<artifactId>${jdbc.artifactId}</artifactId>
89-
<version>${jdbc.version}</version>
90-
</dependency>
91-
</dependencies>
9267
</plugin>
93-
94-
95-
<!-- DB Unit for providing Seed Data -->
96-
9768
<plugin>
98-
<groupId>org.codehaus.mojo</groupId>
99-
<artifactId>dbunit-maven-plugin</artifactId>
100-
<version>1.0-beta-1</version>
101-
<configuration>
102-
<dataTypeFactoryName>${dbunit.dataTypeFactoryName}</dataTypeFactoryName>
103-
<driver>${jdbc.driverClassName}</driver>
104-
<username>${jdbc.username}</username>
105-
<password>${jdbc.password}</password>
106-
<url>${jdbc.url}</url>
107-
<src>src/db/seed-data.xml</src>
108-
<type>${dbunit.operation.type}</type>
109-
<schema>${dbunit.schema}</schema>
110-
<skip>${maven.test.skip}</skip>
111-
</configuration>
69+
<groupId>org.zeroturnaround</groupId>
70+
<artifactId>javarebel-maven-plugin</artifactId>
71+
<version>1.0.5</version>
11272
<executions>
11373
<execution>
114-
<id>test-compile</id>
115-
<phase>test-compile</phase>
74+
<id>generate-rebel-xml</id>
75+
<phase>process-resources</phase>
11676
<goals>
117-
<goal>operation</goal>
77+
<goal>generate</goal>
11878
</goals>
11979
</execution>
120-
12180
</executions>
122-
<dependencies>
123-
<dependency>
124-
<groupId>${jdbc.groupId}</groupId>
125-
<artifactId>${jdbc.artifactId}</artifactId>
126-
<version>${jdbc.version}</version>
127-
</dependency>
128-
</dependencies>
129-
</plugin>
130-
<plugin>
131-
<groupId>org.apache.maven.plugins</groupId>
132-
<artifactId>maven-surefire-plugin</artifactId>
133-
<version>2.4.3</version>
134-
<configuration>
135-
<excludes>
136-
<exclude>**/migration/*.java</exclude>
137-
</excludes>
138-
</configuration>
139-
</plugin>
140-
<plugin>
141-
<groupId>org.zeroturnaround</groupId>
142-
<artifactId>javarebel-maven-plugin</artifactId>
143-
<version>1.0.5</version>
144-
<executions>
145-
<execution>
146-
<id>generate-rebel-xml</id>
147-
<phase>process-resources</phase>
148-
<goals>
149-
<goal>generate</goal>
150-
</goals>
151-
</execution>
152-
</executions>
15381
</plugin>
15482

15583
</plugins>
@@ -193,87 +121,57 @@
193121
<artifactId>${jdbc.artifactId}</artifactId>
194122
<version>${jdbc.version}</version>
195123
</dependency>
196-
<dependency>
124+
<dependency>
197125
<groupId>com.rosaloves</groupId>
198126
<artifactId>bitlyj</artifactId>
199127
<version>1.0-SNAPSHOT</version>
200-
</dependency>
201-
<dependency>
202-
<groupId>net.homeip.yusuke</groupId>
203-
<artifactId>twitter4j</artifactId>
204-
<version>2.0.8</version>
205-
<exclusions>
206-
<exclusion>
207-
<groupId>org.slf4j</groupId>
208-
<artifactId>nlog4j</artifactId>
209-
</exclusion>
210-
</exclusions>
211-
</dependency>
212-
<dependency>
213-
<groupId>org.hibernate</groupId>
214-
<artifactId>hibernate-core</artifactId>
215-
<version>3.3.2.GA</version>
216-
<exclusions>
217-
<exclusion>
218-
<groupId>cglib</groupId>
219-
<artifactId>cglib</artifactId>
220-
</exclusion>
221-
</exclusions>
222-
223128
</dependency>
224-
225-
226-
227-
<dependency>
228-
<groupId>org.springframework</groupId>
229-
<artifactId>spring-aop</artifactId>
230-
<version>3.0.0.RC2</version>
231-
<exclusions>
129+
<dependency>
130+
<groupId>net.homeip.yusuke</groupId>
131+
<artifactId>twitter4j</artifactId>
132+
<version>2.0.8</version>
133+
<exclusions>
232134
<exclusion>
233-
<artifactId>com.springsource.org.apache.commons.logging</artifactId>
234-
<groupId>org.apache.commons</groupId>
135+
<groupId>org.slf4j</groupId>
136+
<artifactId>nlog4j</artifactId>
235137
</exclusion>
236138
</exclusions>
237139
</dependency>
238140

239-
<dependency>
240-
<groupId>org.hibernate</groupId>
241-
<artifactId>hibernate-ehcache</artifactId>
242-
<version>3.3.2.GA</version>
243-
</dependency>
244141
<dependency>
245-
<groupId>org.hibernate</groupId>
246-
<artifactId>ejb3-persistence</artifactId>
247-
<version>1.0.2.GA</version>
248-
</dependency>
249-
<dependency>
250-
<groupId>org.hibernate</groupId>
251-
<artifactId>hibernate-annotations</artifactId>
252-
<version>3.4.0.GA</version>
142+
<groupId>jlibs</groupId>
143+
<artifactId>jlibs-core</artifactId>
144+
<version>r479</version>
253145
</dependency>
146+
254147
<dependency>
255-
<groupId>org.hibernate</groupId>
256-
<artifactId>hibernate-search</artifactId>
257-
<version>3.1.0.GA</version>
148+
<groupId>xalan</groupId>
149+
<artifactId>xalan</artifactId>
150+
<version>2.7.1</version>
258151
</dependency>
259152

260153
<dependency>
261-
<groupId>org.hibernate</groupId>
262-
<artifactId>hibernate-entitymanager</artifactId>
263-
<version>3.4.0.GA</version>
154+
<groupId>org.subethamail</groupId>
155+
<artifactId>subethasmtp</artifactId>
156+
<version>3.1.3</version>
157+
<type>jar</type>
158+
<scope>compile</scope>
159+
<exclusions>
160+
<exclusion>
161+
<artifactId>slf4j-simple</artifactId>
162+
<groupId>org.slf4j</groupId>
163+
</exclusion>
164+
</exclusions>
264165
</dependency>
265166

266167
<dependency>
267-
<groupId>jlibs</groupId>
268-
<artifactId>jlibs-core</artifactId>
269-
<version>r479</version>
168+
<groupId>com.h2database</groupId>
169+
<artifactId>h2</artifactId>
170+
<version>1.2.131</version>
171+
<scope>test</scope>
270172
</dependency>
271173

272-
<dependency>
273-
<groupId>xalan</groupId>
274-
<artifactId>xalan</artifactId>
275-
<version>2.7.1</version>
276-
</dependency>
174+
277175

278176
</dependencies>
279177
<profiles>
@@ -283,6 +181,7 @@
283181
<hibernate.show_sql>false</hibernate.show_sql>
284182
</properties>
285183
</profile>
184+
286185
<!-- ================= Database Profiles ================= -->
287186
<profile>
288187
<id>derby</id>
@@ -293,8 +192,8 @@
293192
<jdbc.version>10.2.2.0</jdbc.version>
294193
<jdbc.driverClassName>org.apache.derby.jdbc.ClientDriver</jdbc.driverClassName>
295194
<jdbc.url><![CDATA[jdbc:derby://localhost/appfuse_test;create=true]]></jdbc.url>
296-
<jdbc.username>any</jdbc.username>
297-
<jdbc.password>value</jdbc.password>
195+
<jdbc.username>jrecruiter</jdbc.username>
196+
<jdbc.password>jrecruiter</jdbc.password>
298197
</properties>
299198
</profile>
300199
<profile>
@@ -304,11 +203,11 @@
304203
<hibernate.dialect>org.hibernate.dialect.H2Dialect</hibernate.dialect>
305204
<jdbc.groupId>com.h2database</jdbc.groupId>
306205
<jdbc.artifactId>h2</jdbc.artifactId>
307-
<jdbc.version>1.1.115</jdbc.version>
206+
<jdbc.version>1.2.131</jdbc.version>
308207
<jdbc.driverClassName>org.h2.Driver</jdbc.driverClassName>
309208
<jdbc.url><![CDATA[jdbc:h2:jrecruiter_test]]></jdbc.url>
310-
<jdbc.username>sa</jdbc.username>
311-
<jdbc.password></jdbc.password>
209+
<jdbc.username>jrecruiter</jdbc.username>
210+
<jdbc.password>jrecruiter</jdbc.password>
312211
</properties>
313212
</profile>
314213
<profile>
@@ -321,8 +220,8 @@
321220
<jdbc.version>1.8.0.7</jdbc.version>
322221
<jdbc.driverClassName>org.hsqldb.jdbcDriver</jdbc.driverClassName>
323222
<jdbc.url><![CDATA[jdbc:hsqldb:jrecruiter_test;shutdown=true]]></jdbc.url>
324-
<jdbc.username>sa</jdbc.username>
325-
<jdbc.password></jdbc.password>
223+
<jdbc.username>jrecruiter</jdbc.username>
224+
<jdbc.password>jrecruiter</jdbc.password>
326225
</properties>
327226
</profile>
328227
<profile>
@@ -336,8 +235,8 @@
336235
<jdbc.version>10.2.0.2.0</jdbc.version>
337236
<jdbc.driverClassName>oracle.jdbc.OracleDriver</jdbc.driverClassName>
338237
<jdbc.url><![CDATA[jdbc:oracle:thin:@localhost:1521:XE]]></jdbc.url>
339-
<jdbc.username>system</jdbc.username>
340-
<jdbc.password>system</jdbc.password>
238+
<jdbc.username>jrecruiter</jdbc.username>
239+
<jdbc.password>jrecruiter</jdbc.password>
341240
</properties>
342241
</profile>
343242
<profile>
@@ -382,22 +281,22 @@
382281
<jdbc.artifactId>jtds</jdbc.artifactId>
383282
<jdbc.version>1.2</jdbc.version>
384283
<jdbc.driverClassName>net.sourceforge.jtds.jdbc.Driver</jdbc.driverClassName>
385-
<jdbc.url><![CDATA[jdbc:jtds:sqlserver://localhost:3683/appfuse_test]]></jdbc.url>
386-
<jdbc.username>sa</jdbc.username>
387-
<jdbc.password>appfuse</jdbc.password>
284+
<jdbc.url><![CDATA[jdbc:jtds:sqlserver://localhost:3683/jrecruiter]]></jdbc.url>
285+
<jdbc.username>jrecruiter</jdbc.username>
286+
<jdbc.password>jrecruiter</jdbc.password>
388287
</properties>
389288
</profile>
390289
</profiles>
391290

392291
<properties>
393-
<dbunit.operation.type>INSERT</dbunit.operation.type>
394-
<hibernate.dialect>org.hibernate.dialect.PostgreSQLDialect</hibernate.dialect>
395-
<jdbc.groupId>postgresql</jdbc.groupId>
396-
<jdbc.artifactId>postgresql</jdbc.artifactId>
397-
<jdbc.version>8.1-407.jdbc3</jdbc.version>
398-
<jdbc.driverClassName>org.postgresql.Driver</jdbc.driverClassName>
399-
<jdbc.url><![CDATA[jdbc:postgresql://localhost:15432/jrecruiter]]></jdbc.url>
400-
<jdbc.username>jrecruiter</jdbc.username>
401-
<jdbc.password>jrecruiter</jdbc.password>
292+
<dbunit.operation.type>INSERT</dbunit.operation.type>
293+
<hibernate.dialect>org.hibernate.dialect.PostgreSQLDialect</hibernate.dialect>
294+
<jdbc.groupId>postgresql</jdbc.groupId>
295+
<jdbc.artifactId>postgresql</jdbc.artifactId>
296+
<jdbc.version>8.1-407.jdbc3</jdbc.version>
297+
<jdbc.driverClassName>org.postgresql.Driver</jdbc.driverClassName>
298+
<jdbc.url><![CDATA[jdbc:postgresql://localhost:15432/jrecruiter]]></jdbc.url>
299+
<jdbc.username>jrecruiter</jdbc.username>
300+
<jdbc.password>jrecruiter</jdbc.password>
402301
</properties>
403302
</project>

0 commit comments

Comments
 (0)