Index: lams_contentrepository/build.xml
===================================================================
diff -u -r5b94a63e1612352920cadb35e667f10e585cc4aa -r59a810e17dffd1a080d8f1637cd202b9cc6fa4cb
--- lams_contentrepository/build.xml (.../build.xml) (revision 5b94a63e1612352920cadb35e667f10e585cc4aa)
+++ lams_contentrepository/build.xml (.../build.xml) (revision 59a810e17dffd1a080d8f1637cd202b9cc6fa4cb)
@@ -56,13 +56,16 @@
-
-
+
+
+
+
+
@@ -211,6 +214,22 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -330,34 +349,6 @@
todir="${jboss.deploy}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -379,5 +370,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_contentrepository/db/sql/insert_test_data.sql
===================================================================
diff -u -rf94fa61ab822b84ac3ff6fac4fbed412a8a2223f -r59a810e17dffd1a080d8f1637cd202b9cc6fa4cb
--- lams_contentrepository/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision f94fa61ab822b84ac3ff6fac4fbed412a8a2223f)
+++ lams_contentrepository/db/sql/insert_test_data.sql (.../insert_test_data.sql) (revision 59a810e17dffd1a080d8f1637cd202b9cc6fa4cb)
@@ -1,38 +1,2 @@
-use lams;
-
-SET FOREIGN_KEY_CHECKS=0;
-
-DELETE from lams_cr_node_version_property;
-DELETE from lams_cr_node_version;
-DELETE from lams_cr_node;
-
-DELETE from lams_cr_workspace_credential ;
-DELETE from lams_cr_credential ;
-DELETE from lams_cr_workspace ;
-
-SET FOREIGN_KEY_CHECKS=1;
-
-INSERT INTO lams_cr_credential (credential_id, name, password) VALUES (1, 'atool','atool');
-INSERT INTO lams_cr_workspace (workspace_id, name) VALUES (1, 'atoolWorkspace');
-INSERT INTO lams_cr_workspace_credential (wc_id, workspace_id, credential_id) VALUES (1, 1,1);
-INSERT INTO lams_cr_workspace (workspace_id, name) VALUES (2, 'atoolWorkspace2');
-INSERT INTO lams_cr_workspace_credential (wc_id, workspace_id, credential_id) VALUES (2, 2,1);
-
-INSERT INTO lams_cr_node (node_id, workspace_id, type, created_date_time, path, next_version_id) VALUES (1, 1, 'DATANODE', 20050106103100, "/test",3);
-INSERT INTO lams_cr_node_version (nv_id, node_id, version_id, created_date_time)
-VALUES (1, 1, 1, 20050106103100);
-INSERT INTO lams_cr_node_version (nv_id, node_id, version_id, created_date_time)
-VALUES (2, 1, 2, 20050106110000);
-
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (1,1,"APPSPEC","abcd","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (2,1,"VERSIONDESC","Initial Version.","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (3,2,"APPSEC","The quick brown fox jumped over the lazy dog.","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (4,2,"VERSIONDESC","The second version.","STRING");
-
--- Note : this file node is missing its file as can't setup the repository
-INSERT INTO lams_cr_node (node_id, workspace_id, type, created_date_time, path, next_version_id) VALUES (2, 1, 'FILENODE', 20050106103100, "", 2);
-INSERT INTO lams_cr_node_version (nv_id, node_id, version_id, created_date_time)
-VALUES (3, 2, 1, 20050106103100);
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (5,3,"VERSIONDESC","Initial Version.","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (6,3,"FILENAME","nofile.txt","STRING");
-INSERT INTO lams_cr_node_version_property( id, nv_id, name, value, type) VALUES (7,3,"MIMETYPE","unknown/unknown","STRING");
\ No newline at end of file
+-- This file has been replaced with the add_test_data script
+-- in the lams_common project.
\ No newline at end of file
Index: lams_contentrepository/lib/mysql/mysql-connector-java-3.0.16-ga-bin.jar
===================================================================
diff -u -rf8e8b8eab8ee835edcd8f6c75b249717e62edc11 -r59a810e17dffd1a080d8f1637cd202b9cc6fa4cb
Binary files differ
Index: lams_contentrepository/lib/mysql/mysql-connector-java-3.1.7-bin.jar
===================================================================
diff -u
Binary files differ
Index: lams_contentrepository/properties.xml
===================================================================
diff -u -r5b94a63e1612352920cadb35e667f10e585cc4aa -r59a810e17dffd1a080d8f1637cd202b9cc6fa4cb
--- lams_contentrepository/properties.xml (.../properties.xml) (revision 5b94a63e1612352920cadb35e667f10e585cc4aa)
+++ lams_contentrepository/properties.xml (.../properties.xml) (revision 59a810e17dffd1a080d8f1637cd202b9cc6fa4cb)
@@ -38,6 +38,8 @@
+
+
@@ -50,7 +52,9 @@
+
+
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -r59a810e17dffd1a080d8f1637cd202b9cc6fa4cb
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java (.../FileDAO.java) (revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java (.../FileDAO.java) (revision 59a810e17dffd1a080d8f1637cd202b9cc6fa4cb)
@@ -137,7 +137,7 @@
throw new FileException(message, e);
} finally {
- // always want to close is
+
try {
if ( is != null )
is.close();
@@ -146,13 +146,12 @@
log.error(message,e1);
new FileException(message, e1);
}
- // only try to close os if an error occured
+
try {
- if ( writeErrorOccured && os != null )
+ if ( os != null )
os.close();
} catch (IOException e2) {
- String message = "Unable to close output filestream due to IOException. This may be due to the previous exception "
- +". Original filename ";
+ String message = "Unable to close file in repository due to IOException";
log.error(message,e2);
new FileException(message, e2);
}
Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties
===================================================================
diff -u -rf94fa61ab822b84ac3ff6fac4fbed412a8a2223f -r59a810e17dffd1a080d8f1637cd202b9cc6fa4cb
--- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties (.../dbConnection.properties) (revision f94fa61ab822b84ac3ff6fac4fbed412a8a2223f)
+++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dbConnection.properties (.../dbConnection.properties) (revision 59a810e17dffd1a080d8f1637cd202b9cc6fa4cb)
@@ -23,7 +23,7 @@
#jdbc configuration
jdbc.driverClassName=com.mysql.jdbc.Driver
-jdbc.url=jdbc:mysql://localhost/lams
+jdbc.url=jdbc:mysql://localhost/lams?characterEncoding=utf8
jdbc.username=lams
jdbc.password=lamsdemo
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/BaseTestCase.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -r59a810e17dffd1a080d8f1637cd202b9cc6fa4cb
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/BaseTestCase.java (.../BaseTestCase.java) (revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/BaseTestCase.java (.../BaseTestCase.java) (revision 59a810e17dffd1a080d8f1637cd202b9cc6fa4cb)
@@ -23,7 +23,6 @@
import junit.framework.TestCase;
-import org.apache.log4j.BasicConfigurator;
import org.lamsfoundation.lams.contentrepository.ICredentials;
import org.lamsfoundation.lams.contentrepository.IRepository;
import org.lamsfoundation.lams.contentrepository.IRepositoryAdmin;
Fisheye: Tag 59a810e17dffd1a080d8f1637cd202b9cc6fa4cb refers to a dead (removed) revision in file `lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/NodeTransactionTest.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/TestSimpleTicket.java
===================================================================
diff -u -rd69fd0c0b6e3af330bb1ddbf3099022feca3f092 -r59a810e17dffd1a080d8f1637cd202b9cc6fa4cb
--- lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/TestSimpleTicket.java (.../TestSimpleTicket.java) (revision d69fd0c0b6e3af330bb1ddbf3099022feca3f092)
+++ lams_contentrepository/test/java/org/lamsfoundation/lams/contentrepository/TestSimpleTicket.java (.../TestSimpleTicket.java) (revision 59a810e17dffd1a080d8f1637cd202b9cc6fa4cb)
@@ -61,6 +61,7 @@
}
public void testGetWorkspaceId() {
+ assertTrue("Ticket exists.", ticket != null );
Long id = ticket.getWorkspaceId();
assertTrue("Ticket has workspaceId.", id != null );
assertTrue("Workspace id is "+id
@@ -69,6 +70,7 @@
}
public void testGetTicketId() {
+ assertTrue("Ticket exists.", ticket != null );
String id = ticket.getTicketId();
assertTrue("Ticket has a ticketId.", id != null );
}