[sakai] svn commit: r79176 - in msub/iu.edu/oncourse/trunk/turnitin-content-review: . ddl ddl/db2 ddl/derby ddl/hsqldb ddl/mssql ddl/mysql ddl/oracle ddl/postgres hbm/src/java/org/sakaiproject/contentreview hbm/src/java/org/sakaiproject/contentreview/hbm hbm/src/java/org/sakaiproject/contentreview/model impl/src/java/org/sakaiproject impl/src/java/org/sakaiproject/component impl/src/java/org/sakaiproject/component/app impl/src/java/org/sakaiproject/component/app/scheduler impl/src/java/org/sakaiproject/component/app/scheduler/jobs impl/src/java/org/sakaiproject/contentreview/impl/turnitin impl/src/java/org/sakaiproject/turnitin/util pack/src/webapp/WEB-INF sql sql/mysql sql/oracle
swgithen at mtu.edu
swgithen at mtu.edu
Wed Jul 7 15:26:15 PDT 2010
Details: http://source.sakaiproject.org/viewsvn?root=svn&view=rev&rev=79176
Author: swgithen at mtu.edu
Date: 2010-07-07 18:26:14 -0400 (Wed, 07 Jul 2010)
New Revision: 79176
Added:
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/db2/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/db2/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/derby/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/derby/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-db2.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-derby.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-hsqldb.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-mssql.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-mysql.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-oracle.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-postgres.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate.cfg.xml
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hsqldb/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hsqldb/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/mssql/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/mssql/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/mysql/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/mysql/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/oracle/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/oracle/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/pom.xml
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/postgres/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/postgres/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/readme.txt
msub/iu.edu/oncourse/trunk/turnitin-content-review/hbm/src/java/org/sakaiproject/contentreview/hbm/ContentReviewRosterSyncItem.hbm.xml
msub/iu.edu/oncourse/trunk/turnitin-content-review/hbm/src/java/org/sakaiproject/contentreview/model/
msub/iu.edu/oncourse/trunk/turnitin-content-review/hbm/src/java/org/sakaiproject/contentreview/model/ContentReviewRosterSyncItem.java
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/component/
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/component/app/
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/component/app/scheduler/
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/component/app/scheduler/jobs/
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/component/app/scheduler/jobs/ContentReviewTurnitinRosterSync.java
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/contentreview/impl/turnitin/MembershipChangeObserver.java
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/contentreview/impl/turnitin/TurnitinAccountConnection.java
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/contentreview/impl/turnitin/TurnitinRosterSync.java
msub/iu.edu/oncourse/trunk/turnitin-content-review/sql/
msub/iu.edu/oncourse/trunk/turnitin-content-review/sql/mysql/
msub/iu.edu/oncourse/trunk/turnitin-content-review/sql/mysql/TII-85.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/sql/oracle/
msub/iu.edu/oncourse/trunk/turnitin-content-review/sql/oracle/TII-85.sql
Removed:
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/db2/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/db2/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/derby/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/derby/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-db2.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-derby.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-hsqldb.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-mssql.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-mysql.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-oracle.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate-postgres.properties
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hibernate.cfg.xml
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hsqldb/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/hsqldb/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/mssql/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/mssql/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/mysql/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/mysql/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/oracle/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/oracle/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/pom.xml
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/postgres/
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/postgres/turnitin-contentreview.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/ddl/readme.txt
msub/iu.edu/oncourse/trunk/turnitin-content-review/hbm/src/java/org/sakaiproject/contentreview/model/ContentReviewRosterSyncItem.java
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/component/app/
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/component/app/scheduler/
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/component/app/scheduler/jobs/
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/component/app/scheduler/jobs/ContentReviewTurnitinRosterSync.java
msub/iu.edu/oncourse/trunk/turnitin-content-review/sql/mysql/
msub/iu.edu/oncourse/trunk/turnitin-content-review/sql/mysql/TII-85.sql
msub/iu.edu/oncourse/trunk/turnitin-content-review/sql/oracle/
msub/iu.edu/oncourse/trunk/turnitin-content-review/sql/oracle/TII-85.sql
Modified:
msub/iu.edu/oncourse/trunk/turnitin-content-review/
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/contentreview/impl/turnitin/TurnitinReviewServiceImpl.java
msub/iu.edu/oncourse/trunk/turnitin-content-review/impl/src/java/org/sakaiproject/turnitin/util/TIIFID.java
msub/iu.edu/oncourse/trunk/turnitin-content-review/pack/src/webapp/WEB-INF/components.xml
msub/iu.edu/oncourse/trunk/turnitin-content-review/pack/src/webapp/WEB-INF/hibernate-hbms.xml
msub/iu.edu/oncourse/trunk/turnitin-content-review/pack/src/webapp/WEB-INF/spring-hibernate.xml
Log:
ONC-2440 Merging in vendor drop r69093
18:19:40 turnitin-content-review: svn merge --dry-run https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/vendor/turnitin/turnitin-contentreview-impl/turnitin_2-6-x_r65828/contentreview-impl/ https://source.sakaiproject.org/svn/msub/iu.edu/oncourse/vendor/turnitin/turnitin-contentreview-impl/current/contentreview-impl/ .
--- Merging differences between repository URLs into '.':
A sql
A sql/mysql
A sql/mysql/TII-85.sql
A sql/oracle
A sql/oracle/TII-85.sql
A impl/src/java/org/sakaiproject/component
A impl/src/java/org/sakaiproject/component/app
A impl/src/java/org/sakaiproject/component/app/scheduler
A impl/src/java/org/sakaiproject/component/app/scheduler/jobs
A impl/src/java/org/sakaiproject/component/app/scheduler/jobs/ContentReviewTurnitinRosterSync.java
C impl/src/java/org/sakaiproject/contentreview/impl/turnitin/TurnitinReviewServiceImpl.java
A impl/src/java/org/sakaiproject/contentreview/impl/turnitin/TurnitinRosterSync.java
A impl/src/java/org/sakaiproject/contentreview/impl/turnitin/MembershipChangeObserver.java
A impl/src/java/org/sakaiproject/contentreview/impl/turnitin/TurnitinAccountConnection.java
U impl/src/java/org/sakaiproject/turnitin/util/TIIFID.java
A ddl
A ddl/hibernate-mssql.properties
A ddl/pom.xml
A ddl/hibernate.cfg.xml
A ddl/hibernate-derby.properties
A ddl/hibernate-mysql.properties
A ddl/hibernate-oracle.properties
A ddl/mssql
A ddl/mssql/turnitin-contentreview.sql
A ddl/hibernate-postgres.properties
A ddl/hibernate-db2.properties
A ddl/derby
A ddl/derby/turnitin-contentreview.sql
A ddl/mysql
A ddl/mysql/turnitin-contentreview.sql
A ddl/oracle
A ddl/oracle/turnitin-contentreview.sql
A ddl/postgres
A ddl/postgres/turnitin-contentreview.sql
A ddl/db2
A ddl/db2/turnitin-contentreview.sql
A ddl/hibernate-hsqldb.properties
A ddl/readme.txt
A ddl/hsqldb
A ddl/hsqldb/turnitin-contentreview.sql
A hbm/src/java/org/sakaiproject/contentreview/model
A hbm/src/java/org/sakaiproject/contentreview/model/ContentReviewRosterSyncItem.java
A hbm/src/java/org/sakaiproject/contentreview/hbm/ContentReviewRosterSyncItem.hbm.xml
U pack/src/webapp/WEB-INF/spring-hibernate.xml
U pack/src/webapp/WEB-INF/components.xml
U pack/src/webapp/WEB-INF/hibernate-hbms.xml
Summary of conflicts:
Text conflicts: 1
More information about the source
mailing list