Author: solomax
Date: Sat Feb 22 03:52:42 2014
New Revision: 1570786
URL: http://svn.apache.org/r1570786
Log:
signWebStartJars ant target is fixed;
logging in TestOldBackups is improved;
Modified:
openmeetings/branches/3.0.x/build.xml
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
Modified: openmeetings/branches/3.0.x/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/build.xml?rev=1570786&r1=1570785&r2=1570786&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/build.xml (original)
+++ openmeetings/branches/3.0.x/build.xml Sat Feb 22 03:52:42 2014
@@ -290,7 +290,7 @@
<include name="**/*.xml" />
<include name="**/*.png" />
</patternset>
- <patternset id="resources">
+ <patternset id="xmlpngconf">
<patternset refid="xmlpng" />
<include name="**/*.conf" />
<include name="**/*.properties" />
@@ -299,7 +299,7 @@
<!-- Main Applications -->
<copy todir="${main.out.dir}" includeEmptyDirs="yes">
<fileset dir="${src.base.dir}">
- <patternset refid="resources" />
+ <patternset refid="xmlpngconf" />
</fileset>
</copy>
<!-- Screen Share resources -->
@@ -675,7 +675,7 @@
<target name="compile" depends="compile.only, prepare" />
<target name="compile.only"
-
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-dtd-generator,-retrieve-junit,-retrieve-cmdadmin,-retrieve-tools.jar,resources,compile.only.nocheck"/>
+
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-dtd-generator,-retrieve-junit,-retrieve-cmdadmin,-retrieve-tools.jar,compile.only.nocheck,resources"/>
<target name="compile.only.nocheck" depends="clean.classes">
<antcall target="prepare.mkdir" inheritAll="true"
inheritRefs="true"/>
Modified:
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1570786&r1=1570785&r2=1570786&view=diff
==============================================================================
---
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
(original)
+++
openmeetings/branches/3.0.x/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
Sat Feb 22 03:52:42 2014
@@ -74,7 +74,8 @@ public class TestOldBackups extends Abst
long apptCount = 0;
long meetingMembersCount = 0;
for (File backup : backupsHome.listFiles()) {
- log.debug("Import of backup file : '" +
backup.getName() + "' is started ...");
+ String name = backup.getName();
+ log.debug("Import of backup file : '" + name + "' is
started ...");
try {
backupController.performImport(new
FileInputStream(backup));
long newOrgCount = organisationDao.count();
@@ -83,12 +84,12 @@ public class TestOldBackups extends Abst
long newRoomOrgCount =
roomOrganisationDao.get().size();
long newApptCount =
appointmentDao.getAppointments().size();
long newMeetingMembersCount =
meetingMemberDao.getMeetingMembers().size();
- assertTrue("Zero organizations were imported",
newOrgCount > orgCount);
- assertTrue("Zero users were imported",
newUserCount > userCount);
- assertTrue("Zero rooms were imported",
newRoomCount > roomCount);
- assertTrue("Zero room organizations were
imported", newRoomOrgCount > roomOrgCount);
- assertTrue("Zero appointments were imported",
newApptCount > apptCount);
- assertTrue("Zero meeting members were
imported", newMeetingMembersCount > meetingMembersCount);
+ assertTrue("Zero organizations were imported
from " + name, newOrgCount > orgCount);
+ assertTrue("Zero users were imported from " +
name, newUserCount > userCount);
+ assertTrue("Zero rooms were imported from " +
name, newRoomCount > roomCount);
+ assertTrue("Zero room organizations were
imported from " + name, newRoomOrgCount > roomOrgCount);
+ assertTrue("Zero appointments were imported
from " + name, newApptCount > apptCount);
+ assertTrue("Zero meeting members were imported
from " + name, newMeetingMembersCount > meetingMembersCount);
orgCount = newOrgCount;
userCount = newUserCount;
@@ -97,7 +98,7 @@ public class TestOldBackups extends Abst
apptCount = newApptCount;
meetingMembersCount = newMeetingMembersCount;
} catch (Exception e) {
- throw new RuntimeException("Unexpected
exception while importing backup: " + backup.getName(), e);
+ throw new RuntimeException("Unexpected
exception while importing backup: " + name, e);
}
log.debug("... Done.");
}
Modified: openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1570786&r1=1570785&r2=1570786&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Sat Feb 22 03:52:42 2014
@@ -292,7 +292,7 @@
<include name="**/*.xml" />
<include name="**/*.png" />
</patternset>
- <patternset id="resources">
+ <patternset id="xmlpngconf">
<patternset refid="xmlpng" />
<include name="**/*.conf" />
<include name="**/*.properties" />
@@ -301,7 +301,7 @@
<!-- Main Applications -->
<copy todir="${main.out.dir}" includeEmptyDirs="yes">
<fileset dir="${src.base.dir}">
- <patternset refid="resources" />
+ <patternset refid="xmlpngconf" />
</fileset>
</copy>
<!-- Screen Share resources -->
@@ -676,7 +676,7 @@
<target name="compile" depends="compile.only, prepare" />
<target name="compile.only"
-
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-dtd-generator,-retrieve-junit,-retrieve-cmdadmin,-retrieve-tools.jar,resources,compile.only.nocheck"/>
+
depends="-retrieve-mainlibs,-retrieve-om,-retrieve-dtd-generator,-retrieve-junit,-retrieve-cmdadmin,-retrieve-tools.jar,compile.only.nocheck,resources"/>
<target name="compile.only.nocheck" depends="clean.classes">
<antcall target="prepare.mkdir" inheritAll="true"
inheritRefs="true"/>
Modified:
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1570786&r1=1570785&r2=1570786&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
(original)
+++
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
Sat Feb 22 03:52:42 2014
@@ -74,7 +74,8 @@ public class TestOldBackups extends Abst
long apptCount = 0;
long meetingMembersCount = 0;
for (File backup : backupsHome.listFiles()) {
- log.debug("Import of backup file : '" +
backup.getName() + "' is started ...");
+ String name = backup.getName();
+ log.debug("Import of backup file : '" + name + "' is
started ...");
try {
backupController.performImport(new
FileInputStream(backup));
long newOrgCount = organisationDao.count();
@@ -83,12 +84,12 @@ public class TestOldBackups extends Abst
long newRoomOrgCount =
roomOrganisationDao.get().size();
long newApptCount =
appointmentDao.getAppointments().size();
long newMeetingMembersCount =
meetingMemberDao.getMeetingMembers().size();
- assertTrue("Zero organizations were imported",
newOrgCount > orgCount);
- assertTrue("Zero users were imported",
newUserCount > userCount);
- assertTrue("Zero rooms were imported",
newRoomCount > roomCount);
- assertTrue("Zero room organizations were
imported", newRoomOrgCount > roomOrgCount);
- assertTrue("Zero appointments were imported",
newApptCount > apptCount);
- assertTrue("Zero meeting members were
imported", newMeetingMembersCount > meetingMembersCount);
+ assertTrue("Zero organizations were imported
from " + name, newOrgCount > orgCount);
+ assertTrue("Zero users were imported from " +
name, newUserCount > userCount);
+ assertTrue("Zero rooms were imported from " +
name, newRoomCount > roomCount);
+ assertTrue("Zero room organizations were
imported from " + name, newRoomOrgCount > roomOrgCount);
+ assertTrue("Zero appointments were imported
from " + name, newApptCount > apptCount);
+ assertTrue("Zero meeting members were imported
from " + name, newMeetingMembersCount > meetingMembersCount);
orgCount = newOrgCount;
userCount = newUserCount;
@@ -97,7 +98,7 @@ public class TestOldBackups extends Abst
apptCount = newApptCount;
meetingMembersCount = newMeetingMembersCount;
} catch (Exception e) {
- throw new RuntimeException("Unexpected
exception while importing backup: " + backup.getName(), e);
+ throw new RuntimeException("Unexpected
exception while importing backup: " + name, e);
}
log.debug("... Done.");
}
