Author: chathura
Date: Wed Jan 2 01:22:22 2008
New Revision: 11739
Log:
Removed some unused database fields from database scripts and from the data
access code.
Fixed an issue with uploading large resources.
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/hsql/DBUtils.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/registry.xml
trunk/registry/modules/core/src/main/resources/database-scripts/derby-complete.sql
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/dao/VersionedResourceDAO.java
Wed Jan 2 01:22:22 2008
@@ -454,8 +454,8 @@
// first add the resource data into the artifacts table
String sql =
- "INSERT INTO ARTIFACTS (PATH, MEDIA_TYPE, DIRECTORY, STATE,
CREATED_TIME, AUTHOR, LAST_UPDATER, LAST_UPDATED_TIME, DESCRIPTION, CONTENT)" +
- "VALUES (?,?,?,?,?,?,?,?,?,?)";
+ "INSERT INTO ARTIFACTS (PATH, MEDIA_TYPE, DIRECTORY, STATE,
CREATED_TIME, AUTHOR, DESCRIPTION)" +
+ "VALUES (?,?,?,?,?,?,?)";
long now = System.currentTimeMillis();
@@ -466,15 +466,7 @@
s.setInt(4, RegistryConstants.ACTIVE_STATE);
s.setTimestamp(5, new Timestamp(now));
s.setString(6, resource.getAuthorUserName());
- s.setString(7, resource.getLastUpdaterUserName());
- s.setTimestamp(8, new Timestamp(now));
- s.setString(9, resource.getDescription());
-
- if (resource.getContent() != null && resource.getContent() instanceof
byte[]) {
- s.setBytes(10, (byte[])resource.getContent());
- } else {
- s.setBytes(10, null);
- }
+ s.setString(7, resource.getDescription());
s.executeUpdate();
@@ -490,9 +482,7 @@
// first update the artifacts table
String sql =
- "UPDATE ARTIFACTS SET MEDIA_TYPE=?, DIRECTORY=?, STATE=?,
AUTHOR=?, LAST_UPDATER=?, LAST_UPDATED_TIME=?, DESCRIPTION=?, CONTENT=? WHERE
PATH=?";
-
- long now = System.currentTimeMillis();
+ "UPDATE ARTIFACTS SET MEDIA_TYPE=?, DIRECTORY=?, STATE=?,
AUTHOR=?, DESCRIPTION=? WHERE PATH=?";
PreparedStatement s = conn.prepareStatement(sql);
@@ -500,17 +490,9 @@
s.setInt(2, resource.isDirectory() ? 1 : 0);
s.setInt(3, resource.getState());
s.setString(4, resource.getAuthorUserName());
- s.setString(5, resource.getLastUpdaterUserName());
- s.setTimestamp(6, new Timestamp(now));
- s.setString(7, resource.getDescription());
-
- if (resource.getContent() != null && resource.getContent() instanceof
byte[]) {
- s.setBytes(8, (byte[])resource.getContent());
- } else {
- s.setBytes(8, null);
- }
+ s.setString(5, resource.getDescription());
- s.setString(9, path);
+ s.setString(6, path);
s.executeUpdate();
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/hsql/DBUtils.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/hsql/DBUtils.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/jdbc/hsql/DBUtils.java
Wed Jan 2 01:22:22 2008
@@ -31,10 +31,7 @@
"STATE INTEGER," +
"AUTHOR VARCHAR (500)," +
"CREATED_TIME TIMESTAMP," +
- "LAST_UPDATER VARCHAR (500)," +
- "LAST_UPDATED_TIME TIMESTAMP," +
"DESCRIPTION VARCHAR (500)," +
- "CONTENT BINARY," +
"PRIMARY KEY (AID)," +
"UNIQUE(PATH))";
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/FileUploadUtil.java
Wed Jan 2 01:22:22 2008
@@ -77,13 +77,13 @@
}
InputStream in = item.getInputStream();
- byte[] buf = new byte[3000];
int read;
ByteArrayOutputStream out = new
ByteArrayOutputStream();
- while ((read = in.read(buf)) > 0) {
- out.write(buf, 0, read);
+ while ((read = in.read()) > 0) {
+ out.write(read);
}
out.flush();
+
if (fileNameOnly.endsWith(".xml") ||
fileNameOnly.endsWith(".wsdl") ||
fileNameOnly.endsWith("xsd")) {
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/registry.xml
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/registry.xml
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/servlet/registry.xml
Wed Jan 2 01:22:22 2008
@@ -9,7 +9,7 @@
</dbconfig>
<dbconfig name="derby-db">
- <url>jdbc:derby:/home/chathura/temp/regdb2000</url>
+ <url>jdbc:derby:/home/chathura/test/t100</url>
<userName>cce</userName>
<password>cce</password>
<driverName>org.apache.derby.jdbc.EmbeddedDriver</driverName>
Modified:
trunk/registry/modules/core/src/main/resources/database-scripts/derby-complete.sql
==============================================================================
---
trunk/registry/modules/core/src/main/resources/database-scripts/derby-complete.sql
(original)
+++
trunk/registry/modules/core/src/main/resources/database-scripts/derby-complete.sql
Wed Jan 2 01:22:22 2008
@@ -5,10 +5,7 @@
STATE INTEGER,
AUTHOR VARCHAR (500),
CREATED_TIME TIMESTAMP,
- LAST_UPDATER VARCHAR (500),
- LAST_UPDATED_TIME TIMESTAMP,
DESCRIPTION VARCHAR (10000),
- CONTENT BLOB,
PRIMARY KEY (AID),
UNIQUE(PATH));
@@ -64,7 +61,7 @@
CREATE TABLE VERSIONS (
AID INTEGER NOT NULL,
VN INTEGER NOT NULL,
- CONTENT BLOB,
+ CONTENT BLOB(100M),
AUTHOR VARCHAR (500),
UPDATED_TIME TIMESTAMP,
UNIQUE (AID,VN),
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
