Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1042 → Rev 1043

/hostadmiral/trunk/conf/README
File deleted
/hostadmiral/trunk/conf/hibernate.cfg.xml
File deleted
/hostadmiral/trunk/conf/log4j.properties
File deleted
/hostadmiral/trunk/build.xml
6,7 → 6,6
<property name="classes" location="classes" />
<property name="app.web-inf" location="webapp/WEB-INF" />
<property name="classes.deploy" location="${app.web-inf}/classes" />
<property name="conf" location="conf" />
<property name="lib" location="lib" />
<property name="lib.ant" location="lib/ant" />
<property name="lib.deploy" location="${app.web-inf}/lib" />
110,8 → 109,8
includes="**/*.properties"
/>
 
<copy todir="${classes.deploy}" file="${conf}/log4j.properties" />
<copy todir="${classes.deploy}" file="${conf}/hibernate.cfg.xml" />
<copy todir="${classes.deploy}" file="${src}/log4j.properties" />
<copy todir="${classes.deploy}" file="${src}/hibernate.cfg.xml" />
 
<touch file="${app.web-inf}/web.xml" />
</target>
/hostadmiral/trunk/src/log4j.properties
0,0 → 1,10
log4j.rootLogger=warn, stdout
 
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
 
log4j.logger.ak=debug
log4j.logger.ak.hostadmiral=debug
 
log4j.logger.net.sf.hibernate=error
/hostadmiral/trunk/src/ak/hostadmiral/util/ProjectVersion.java
11,7 → 11,7
* Project version holder. Understands version from resource ak/hostadmiral/version
* in format ${Major}.${Minor}-rc${ReleaseCanditat}.${Build}${Additional},
* where ${ReleaseCanditat}, ${Build} and ${Additional} are optional.
* ${Additional} contains letters only.
* ${Additional} - the rest.
* Instead of "-rc${ReleaseCanditat}" "-p${Patch}" may exist.
* E.g. 1.2-rc4.1234, 2.0, 2.1.4567M, 3.3-p1.
*/
66,7 → 66,7
private static void parse(String v)
{
Pattern pattern = Pattern.compile(
"^(\\d+)\\.(\\d+)((-rc(\\d+))|(-p(\\d+)))?(\\.(\\d+))?([a-zA-Z]*)$");
"^(\\d+)\\.(\\d+)((-rc(\\d+))|(-p(\\d+)))?(\\.(\\d+))?(.*)$");
Matcher matcher = pattern.matcher(v);
if(!matcher.matches())
throw new RuntimeException(
/hostadmiral/trunk/src/hibernate.cfg.xml
0,0 → 1,12
<?xml version='1.0' encoding='utf-8'?>
<!DOCTYPE hibernate-configuration PUBLIC
"-//Hibernate/Hibernate Configuration DTD 2.0//EN"
"http://hibernate.sourceforge.net/hibernate-configuration-2.0.dtd">
 
<hibernate-configuration>
<session-factory name="java:comp/env/hibernate/SessionFactory">
<property name="show_sql">true</property>
<mapping resource="ak/hostadmiral/util/hibernate/DatabaseVersion.hbm.xml"/>
</session-factory>
</hibernate-configuration>