prickett 02/03/14 01:30:24
Modified: periodicity/src/java/org/apache/commons/periodicity/util
FieldEdits.java
periodicity/src/java/org/apache/commons/periodicity/vobjects
EventDoJrl.java TopParent.java VEvent.java
periodicity/src/xml periodicity-schema.xml
Added: periodicity/src/java/org/apache/commons/periodicity/test
TestConstants.java
periodicity/src/java/org/apache/commons/periodicity/test/vevent
VEventSaveOnlyTest.java
Log:
1. FieldEdits - Changed the pacakge name so that FieldEdits would compile
with xerces 2.0.
2. Changed the name of the setCreationDate method to setCreationDateProp to
have a consistent naming convention.
3. Added an id property to the TopParent.
4. Added code to set the id of the VEvent after it had been inserted into
the database.
5. Added a TestConstants file.
6. Added a test to test VEvent persistence.
Revision Changes Path
1.1
jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/test/TestConstants.java
Index: TestConstants.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Jetspeed" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache" or
* "Apache Jetspeed", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.commons.periodicity.test;
public class TestConstants
{
public static final String PERIODICITY_DATABASE_URL =
"torque.database.periodicity.url";
public static final String PERIODICITY_DATABASE_PASSWORD =
"torque.database.periodicity.password";
public static final String PERIODICITY_DATABASE_USERNAME =
"torque.database.periodicity.username";
}
1.1
jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/test/vevent/VEventSaveOnlyTest.java
Index: VEventSaveOnlyTest.java
===================================================================
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000-2002 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Jetspeed" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache" or
* "Apache Jetspeed", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
package org.apache.commons.periodicity.test.vevent;
import org.apache.torque.Torque;
import org.apache.commons.periodicity.test.TestConstants;
import org.apache.commons.periodicity.util.ICalendarException;
import org.apache.commons.periodicity.om.BasePeriodicityVeventsPeer;
import org.apache.commons.periodicity.properties.Dtstart;
import org.apache.commons.periodicity.properties.Organizer;
import org.apache.commons.periodicity.properties.DTStamp;
import org.apache.commons.periodicity.properties.URLProp;
import org.apache.commons.periodicity.properties.ClassProp;
import org.apache.commons.periodicity.properties.Created;
import org.apache.commons.periodicity.properties.Description;
import org.apache.commons.periodicity.properties.LastModified;
import org.apache.commons.periodicity.properties.RecurID;
import org.apache.commons.periodicity.properties.Sequence;
import org.apache.commons.periodicity.properties.Status;
import org.apache.commons.periodicity.properties.Summary;
import org.apache.commons.periodicity.properties.DurationProp;
import org.apache.commons.periodicity.properties.GeoProp;
import org.apache.commons.periodicity.properties.Location;
import org.apache.commons.periodicity.properties.Priority;
import org.apache.commons.periodicity.properties.Dtend;
import org.apache.commons.periodicity.properties.Transparency;
import org.apache.commons.periodicity.vobjects.VEvent;
import org.apache.commons.periodicity.types.VDuration;
import junit.framework.TestCase;
import junit.framework.Test;
import junit.framework.TestSuite;
import java.lang.reflect.Array;
import java.util.Properties;
import java.sql.DriverManager;
import java.sql.Connection;
import java.sql.Statement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.io.FileInputStream;
import java.util.GregorianCalendar;
/**
* This class is to test if we can successfully saved all the fields in
* the vevent to a database.
*/
public class VEventSaveOnlyTest extends TestCase
{
public static final String ORGANIZER_VALUE = "mailto:[EMAIL PROTECTED]";;
public static final String URL_VALUE = "http://www.shpimp.com";;
public static final String DESCRIPTION_VALUE =
"First event saved into MySQL database using torque generated " +
"peers.";
public static final int SEQUENCE_VALUE = 1;
public static final String SUMMARY_VALUE = "First Event saved in MySQL.";
public static final long DURATION_VALUE = 360;
public static final float LATITUDE_VALUE = (float) 25.0;
public static final float LONGITUDE_VALUE = (float) 26.0;
public static final String LOCATION_VALUE = "Nassau, Delaware. " +
"It sure aint the Bahamas.";
public static final int PRIORITY_VALUE = 5;
/**
* This public constructor passes a String to the TestCase
* constructor.
* @param A name that helps uniquely identify the test, i.e. a date, test#.
*/
public VEventSaveOnlyTest(String name) throws Throwable
{
super("VEventSaveOnlyTest:" + name);
runTest();
}
public static Test suite()
{
try
{
TestSuite suite = new TestSuite();
suite.addTest(new VEventSaveOnlyTest("testSave"));
return suite;
}
catch(Throwable e)
{
e.printStackTrace();
return null;
}
}
protected void setUp() throws Exception
{
Torque.init("./test.properties");
}
/**
* This method tests the no-arg and one-arg constructors.
* For the no-arg constructor it tests both NULL input and
* input using get/set methods.
*/
protected void saveVEvent() throws Exception
{
try
{
/* This first event that will be testing all of the primary values
* of the properties of a VEvent.
*/
Dtstart start = new Dtstart();
GregorianCalendar startTime = new GregorianCalendar();
startTime.set(GregorianCalendar.DATE, 12);
startTime.set(GregorianCalendar.MONTH, GregorianCalendar.MARCH);
startTime.set(GregorianCalendar.YEAR, 2002);
startTime.set(GregorianCalendar.HOUR_OF_DAY, 8);
startTime.set(GregorianCalendar.MINUTE, 30);
start.setDateTime(startTime);
VEvent evt = new VEvent();
evt.setStartProp(start);
Organizer orgr = new Organizer();
orgr.setValue(ORGANIZER_VALUE);
evt.setOrganizerProp(orgr);
DTStamp stamp = new DTStamp();
stamp.setValue(new GregorianCalendar());
evt.setTimeStampProp(stamp);
URLProp url = new URLProp(URL_VALUE);
evt.setURLProp(url);
ClassProp classify = new ClassProp(ClassProp.PUBLIC_CLASS);
GregorianCalendar createTime = new GregorianCalendar();
createTime.set(GregorianCalendar.DATE, 12);
createTime.set(GregorianCalendar.MONTH, GregorianCalendar.MARCH);
createTime.set(GregorianCalendar.YEAR, 2002);
createTime.set(GregorianCalendar.HOUR_OF_DAY, 8);
createTime.set(GregorianCalendar.MINUTE, 31);
Created created = new Created(createTime);
evt.setCreationDateProp(created);
Description desc = new Description(DESCRIPTION_VALUE);
evt.setDescProp(desc);
GregorianCalendar lastmodTime = new GregorianCalendar();
lastmodTime.set(GregorianCalendar.DATE, 12);
lastmodTime.set(GregorianCalendar.MONTH, GregorianCalendar.MARCH);
lastmodTime.set(GregorianCalendar.YEAR, 2002);
lastmodTime.set(GregorianCalendar.HOUR_OF_DAY, 23);
lastmodTime.set(GregorianCalendar.MINUTE, 45);
LastModified lastmod = new LastModified(lastmodTime);
evt.setLastModProp(lastmod);
GregorianCalendar recuridTime = new GregorianCalendar();
recuridTime.set(GregorianCalendar.DATE, 12);
recuridTime.set(GregorianCalendar.MONTH, GregorianCalendar.MARCH);
recuridTime.set(GregorianCalendar.YEAR, 2002);
recuridTime.set(GregorianCalendar.HOUR_OF_DAY, 12);
recuridTime.set(GregorianCalendar.MINUTE, 0);
RecurID recurid = new RecurID();
recurid.setDateTime(recuridTime);
evt.setRecurID(recurid);
Sequence sequence = new Sequence(SEQUENCE_VALUE);
evt.setSequenceProp(sequence);
Status status = new Status(Status.TENTATIVE_STATUS);
evt.setStatusProp(status);
Summary summary = new Summary(SUMMARY_VALUE);
evt.setSummaryProp(summary);
DurationProp duration = new DurationProp(
new VDuration(DURATION_VALUE));
evt.setDurationProp(duration);
GeoProp geo = new GeoProp(LATITUDE_VALUE, LONGITUDE_VALUE);
evt.setGeoProp(geo);
Location location = new Location(LOCATION_VALUE);
evt.setLocationProp(location);
Priority prior = new Priority(PRIORITY_VALUE);
evt.setPriorityProp(prior);
Dtend end = new Dtend();
GregorianCalendar endTime = new GregorianCalendar();
endTime.set(GregorianCalendar.DATE, 12);
endTime.set(GregorianCalendar.MONTH, GregorianCalendar.MARCH);
endTime.set(GregorianCalendar.YEAR, 2002);
endTime.set(GregorianCalendar.HOUR_OF_DAY, 23);
endTime.set(GregorianCalendar.MINUTE, 35);
end.setDateTime(endTime);
evt.setEndTimeProp(end);
Transparency trans =
new Transparency(Transparency.TRANSPARENT_TRANSP);
evt.setTransProp(trans);
evt.save();
Properties props = new Properties();
props.load(new FileInputStream("./test.properties"));
Connection conn = DriverManager.getConnection(
props.getProperty(TestConstants.PERIODICITY_DATABASE_URL),
props.getProperty(
TestConstants.PERIODICITY_DATABASE_USERNAME),
props.getProperty(
TestConstants.PERIODICITY_DATABASE_PASSWORD));
if(conn != null)
{
Statement state = conn.createStatement();
if(state != null)
{
StringBuffer buffy = new StringBuffer();
buffy.append("SELECT * FROM periodicity_vevents WHERE ");
buffy.append(BasePeriodicityVeventsPeer.ID);
buffy.append("=");
buffy.append(String.valueOf(evt.getId()));
ResultSet rs = state.executeQuery(buffy.toString());
if(rs != null)
{
if(rs.next())
{
checkValues(evt, rs);
if(rs.next())
{
fail("More than one Event found in database."
+ " Event should be unique.");
}
}
else
{
fail("Event not found in database.");
}
}
else
{
fail("Test Setup Failure - rs == null");
}
}
else
{
fail("Test Setup Failure - state == null");
}
}
}
catch(Exception e)
{
fail("Test Setup Failure - " + e);
}
}
private void checkValues(VEvent evt, ResultSet rs) throws Exception
{
if(evt != null && rs != null)
{
if(evt.getStartProp() != null &&
evt.getStartProp().getDateTime() != null)
{
assertEquals(evt.getStartProp().getDateTime().getTime()
.getTime(), rs.getLong(
BasePeriodicityVeventsPeer.DTSTART_DATE_TIME));
}
else if(evt.getStartProp() == null)
{
fail("evt.getStartProp() == null");
}
else if(evt.getStartProp().getDateTime() == null)
{
fail("evt.getStartProp().getDateTime() == null");
}
else
{
fail("Unexpected Test Failure - Should not occur.");
}
assertEquals(evt.getOrganizer(), rs.getString(
BasePeriodicityVeventsPeer.ORGANIZER));
if(evt.getTimeStamp() != null)
{
assertEquals(evt.getTimeStamp().getTime().getTime(),
rs.getLong(BasePeriodicityVeventsPeer.DTSTAMP));
}
else
{
fail("evt.getTimeStamp() == null");
}
assertEquals(evt.getURL(), rs.getString(
BasePeriodicityVeventsPeer.URL));
assertEquals(evt.getClassification(), rs.getString(
BasePeriodicityVeventsPeer.CLASSIFICATION));
if(evt.getCreationDate() != null)
{
assertEquals(evt.getCreationDate().getTime().getTime(),
rs.getLong(BasePeriodicityVeventsPeer.DATE_CREATED));
}
else
{
fail("evt.getCreationDate() == null");
}
assertEquals(evt.getDesc(), rs.getString(
BasePeriodicityVeventsPeer.DESCRIPTION));
if(evt.getLastModDate() != null)
{
assertEquals(evt.getLastModDate().getTime().getTime(),
rs.getLong(BasePeriodicityVeventsPeer.LAST_MODIFIED));
}
else
{
fail("evt.getLastModDate() == null");
}
if(evt.getRecurID() != null &&
evt.getRecurID().getDateTime() != null)
{
assertEquals(evt.getRecurID().getDateTime().getTime().getTime(),
rs.getLong(
BasePeriodicityVeventsPeer.RECUR_ID_DATE_TIME));
}
else if(evt.getRecurID() == null)
{
fail("evt.getRecurID() == null");
}
else if(evt.getRecurID().getDateTime() == null)
{
fail("evt.getRecurID().getDateTime() == null");
}
else
{
fail("Unexpected test failure - should not occur");
}
assertEquals(evt.getSequence(), rs.getInt(
BasePeriodicityVeventsPeer.SEQUENCE));
assertEquals(evt.getStatus(), rs.getString(
BasePeriodicityVeventsPeer.STATUS));
assertEquals(evt.getSummary(), rs.getString(
BasePeriodicityVeventsPeer.SUMMARY));
if(evt.getDuration() != null)
{
assertEquals(evt.getDuration().getDuration(), rs.getLong(
BasePeriodicityVeventsPeer.DURATION));
}
else
{
fail("evt.getDuration() == null");
}
if(evt.getGeoProp() != null)
{
assertEquals(evt.getGeoProp().getLatitude(), rs.getFloat(
BasePeriodicityVeventsPeer.GEO_LATITUDE), 0);
assertEquals(evt.getGeoProp().getLongitude(), rs.getFloat(
BasePeriodicityVeventsPeer.GEO_LONGITUDE), 0);
}
else
{
fail("evt.getGeoProp() == null");
}
assertEquals(evt.getLocation(), rs.getString(
BasePeriodicityVeventsPeer.LOCATION));
assertEquals(evt.getPriority(), rs.getInt(
BasePeriodicityVeventsPeer.PRIORITY));
}
else if(evt == null)
{
fail("evt == null");
}
else if(rs == null)
{
fail("rs == null");
}
else
{
fail("Unexpected Test failure - should not occur.");
}
}
/**
* This method runs the test.
*/
protected void runTest() throws Throwable
{
saveVEvent();
}
}
1.3 +1 -1
jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/util/FieldEdits.java
Index: FieldEdits.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/util/FieldEdits.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FieldEdits.java 14 Feb 2002 04:07:19 -0000 1.2
+++ FieldEdits.java 14 Mar 2002 09:30:24 -0000 1.3
@@ -54,7 +54,7 @@
package org.apache.commons.periodicity.util;
-import org.apache.xerces.utils.URI;
+import org.apache.xerces.util.URI;
public class FieldEdits
{
1.2 +1 -1
jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/vobjects/EventDoJrl.java
Index: EventDoJrl.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/vobjects/EventDoJrl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EventDoJrl.java 28 Feb 2002 04:57:17 -0000 1.1
+++ EventDoJrl.java 14 Mar 2002 09:30:24 -0000 1.2
@@ -314,7 +314,7 @@
* object.
* @param newval The new value for the creation date as a Created object
*/
- public void setCreationDate(Created newval)
+ public void setCreationDateProp(Created newval)
{
datecreate = newval;
}
1.2 +23 -1
jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/vobjects/TopParent.java
Index: TopParent.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/vobjects/TopParent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TopParent.java 28 Feb 2002 04:57:17 -0000 1.1
+++ TopParent.java 14 Mar 2002 09:30:24 -0000 1.2
@@ -60,10 +60,12 @@
import java.util.HashSet;
import javax.ejb.EntityContext;
import javax.security.auth.login.LoginContext;
+import org.apache.torque.om.NumberKey;
+import org.apache.commons.periodicity.util.ICalendarException;
public abstract class TopParent extends Object
{
-
+
/** A vector to hold the x-properties that are associated with this
* icalendar object.
*/
@@ -73,12 +75,32 @@
private LoginContext loginContext = null;
+ private Object id = null;
+
protected TopParent(){}
public Object clone() throws CloneNotSupportedException
{
return super.clone();
+ }
+
+ public Object getId()
+ {
+ return id;
+ }
+
+ public void setId(Object obj) throws ICalendarException
+ {
+ if(obj instanceof NumberKey)
+ {
+ id = obj;
+ }
+ else
+ {
+ throw new ICalendarException("Object must be of type NumberKey.");
+ }
}
+
/**
* The purpose of this method is to get all the x properties that
1.3 +1 -0
jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/vobjects/VEvent.java
Index: VEvent.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/vobjects/VEvent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VEvent.java 12 Mar 2002 06:02:46 -0000 1.2
+++ VEvent.java 14 Mar 2002 09:30:24 -0000 1.3
@@ -490,6 +490,7 @@
evt.setDtendTzid(null);
}
evt.save();
+ setId(evt.getId());
}
private void checkStatus(String newval)
1.4 +1 -1
jakarta-commons-sandbox/periodicity/src/xml/periodicity-schema.xml
Index: periodicity-schema.xml
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/periodicity/src/xml/periodicity-schema.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- periodicity-schema.xml 12 Mar 2002 06:02:46 -0000 1.3
+++ periodicity-schema.xml 14 Mar 2002 09:30:24 -0000 1.4
@@ -7,7 +7,7 @@
<column name="id"
required="true"
primaryKey="true"
- type="INTEGER"
+ type="BIGINT"
description="Primary Key Field"/>
<column name="classification"
type="VARCHAR"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
