Author: allee8285
Date: Tue Nov 27 20:52:03 2012
New Revision: 1414399
URL: http://svn.apache.org/viewvc?rev=1414399&view=rev
Log:
CMS migration updates.
Modified:
openjpa/site/trunk/WhoIsWorkingOnWhat.txt
openjpa/site/trunk/content/query-notes.mdtext
openjpa/site/trunk/content/recovering-from-a-vetoed-release.mdtext
openjpa/site/trunk/content/release-management.mdtext
Modified: openjpa/site/trunk/WhoIsWorkingOnWhat.txt
URL: http://svn.apache.org/viewvc/openjpa/site/trunk/WhoIsWorkingOnWhat.txt?rev=1414399&r1=1414398&r2=1414399&view=diff
==============================================================================
--- openjpa/site/trunk/WhoIsWorkingOnWhat.txt (original)
+++ openjpa/site/trunk/WhoIsWorkingOnWhat.txt Tue Nov 27 20:52:03 2012
@@ -97,11 +97,11 @@ done performance-guide.mdtext
done powered-by.mdtext
done privacy-policy.mdtext
done publishing-serp-to-maven-central-repository.mdtext
- query-notes.mdtext
+done query-notes.mdtext
done quick-start.mdtext
- recovering-from-a-vetoed-release.mdtext
+done recovering-from-a-vetoed-release.mdtext
done related-projects.mdtext
- release-management.mdtext
+done release-management.mdtext
done release-setup.mdtext
releasing-openjpa-1.0.x-or-1.1.x-(old-scp-steps).mdtext
releasing-openjpa-1.2.x-(old-scp-steps).mdtext
Modified: openjpa/site/trunk/content/query-notes.mdtext
URL: http://svn.apache.org/viewvc/openjpa/site/trunk/content/query-notes.mdtext?rev=1414399&r1=1414398&r2=1414399&view=diff
==============================================================================
--- openjpa/site/trunk/content/query-notes.mdtext (original)
+++ openjpa/site/trunk/content/query-notes.mdtext Tue Nov 27 20:52:03 2012
@@ -1,4 +1,7 @@
Title: Query Notes
+<a name="Query-Notes"></a>
+
+<pre>
name conflict: QueryImpl from JDBC vs. QueryImpl from kernel
openjpa.kernel.jpql.JPQLParser
joins are done by SelectImpl
@@ -21,4 +24,4 @@ SQLBuffer is the result of applying DBDi
Can append SQLBuffer to another SQLBuffer for e.g. subselects
SQLBuffer is almost a StringBuffer
ResultSetResult will call ResultSet.getInt etc.
-
+</pre>
\ No newline at end of file
Modified: openjpa/site/trunk/content/recovering-from-a-vetoed-release.mdtext
URL: http://svn.apache.org/viewvc/openjpa/site/trunk/content/recovering-from-a-vetoed-release.mdtext?rev=1414399&r1=1414398&r2=1414399&view=diff
==============================================================================
--- openjpa/site/trunk/content/recovering-from-a-vetoed-release.mdtext (original)
+++ openjpa/site/trunk/content/recovering-from-a-vetoed-release.mdtext Tue Nov 27 20:52:03
2012
@@ -1,5 +1,6 @@
Title: Recovering from a vetoed release
<a name="Recoveringfromavetoedrelease-Recoveringfromabadreleaseoravetoedrelease"></a>
+
## Recovering from a bad release or a vetoed release
Recovering from a bad release actually isn't that difficult. You'll have to delete the bad
tag in SVN and rollback the version numbers in all of our pom.xml files.
@@ -12,7 +13,6 @@ Recovering from a bad release actually i
If you have perl installed you can do this in a single command for example to rollback from
1.2.1-SNAPSHOT to 1.2.0-SNAPSHOT
$ perl -pi -e "s;<version>1.2.1-SNAPSHOT</version>;<version>1.2.0-SNAPSHOT</version>;g"
\
- pom.xml */pom.xml */*/pom.xml
-
+ pom.xml */pom.xml */*/pom.xml
If you do not have perl installed you can use a similar tool to edit multiple files or edit
them all by hand.
Modified: openjpa/site/trunk/content/release-management.mdtext
URL: http://svn.apache.org/viewvc/openjpa/site/trunk/content/release-management.mdtext?rev=1414399&r1=1414398&r2=1414399&view=diff
==============================================================================
--- openjpa/site/trunk/content/release-management.mdtext (original)
+++ openjpa/site/trunk/content/release-management.mdtext Tue Nov 27 20:52:03 2012
@@ -1,5 +1,6 @@
Title: Release Management
<a name="ReleaseManagement-ReleaseManagement"></a>
+
# Release Management
<a name="ReleaseManagement-WhereshouldIputmyfix?"></a>
@@ -19,7 +20,7 @@ The release manager(s) is(are) responsib
* Fixes should not be committed without RM approval. These changes may be reverted by the
release manager.
<a name="ReleaseManagement-Somegeneralguidelinesforreleasemanagers"></a>
-### Some general guidelines for release managers
+## Some general guidelines for release managers
* Fixes which are committed to an earlier release should also be present
"up-stream". Ie a fix for 1.0.x should also appear in 1.2.x.
* Issues may not apply to every release, so the previous guideline may not
@@ -32,16 +33,16 @@ The current release managers for the act
<table border="0.5">
<tr bgcolor="lightyellow"><th> branch </th><th> internal release
number </th><th> release manager(s)</th><th> Contact
Release Manager before committing </th></tr>
-<tr><td> 0.9.7-r547073 </td><td> </td><td> Srinivasa
Segu </td><td> Yes </td></tr>
-<tr><td> 1.0.x </td><td> 1.0.5-SNAPSHOT </td><td> Heath
Thomann, Donald Woods </td><td> Yes </td></tr>
-<tr><td> 1.1.x </td><td> 1.1.1-SNAPSHOT </td><td> Patrick
Linskey, Abe White </td><td> Yes </td></tr>
-<tr><td> 1.2.x </td><td> 1.2.3-SNAPSHOT </td><td> Heath
Thomann, Donald Woods </td><td> Yes </td></tr>
-<tr><td> 1.3.x </td><td> 1.3.0-SNAPSHOT </td><td> N/A
\* </td><td> No </td></tr>
-<tr><td> 2.0.x </td><td> 2.0.2-SNAPSHOT </td><td> Donald
Woods, Heath Thomann </td><td> Yes </td></tr>
-<tr><td> 2.1.x </td><td> 2.1.1-SNAPSHOT </td><td> Heath
Thomann </td><td> Yes </td></tr>
-<tr><td> 2.2.x </td><td> 2.2.2-SNAPSHOT </td><td> Albert
Lee </td><td> Yes </td></tr>
-<tr><td> 2.2.1.x </td><td> 2.2.1.1-SNAPSHOT </td><td>
Heath Thomann, Albert Lee </td><td> Yes </td></tr>
-<tr><td> trunk </td><td> 2.3.0-SNAPSHOT </td><td> N/A
\*</td><td> No </td></tr>
+<tr><td class="border"> 0.9.7-r547073 </td><td class="border"> </td><td
class="border"> Srinivasa Segu </td><td class="border"> Yes </td></tr>
+<tr><td class="border"> 1.0.x </td><td class="border"> 1.0.5-SNAPSHOT
</td><td class="border"> Heath Thomann, Donald Woods </td><td class="border">
Yes </td></tr>
+<tr><td class="border"> 1.1.x </td><td class="border"> 1.1.1-SNAPSHOT
</td><td class="border"> Patrick Linskey, Abe White </td><td class="border">
Yes </td></tr>
+<tr><td class="border"> 1.2.x </td><td class="border"> 1.2.3-SNAPSHOT
</td><td class="border"> Heath Thomann, Donald Woods </td><td class="border">
Yes </td></tr>
+<tr><td class="border"> 1.3.x </td><td class="border"> 1.3.0-SNAPSHOT
</td><td class="border"> N/A \* </td><td class="border"> No </td></tr>
+<tr><td class="border"> 2.0.x </td><td class="border"> 2.0.2-SNAPSHOT
</td><td class="border"> Donald Woods, Heath Thomann </td><td class="border">
Yes </td></tr>
+<tr><td class="border"> 2.1.x </td><td class="border"> 2.1.1-SNAPSHOT
</td><td class="border"> Heath Thomann </td><td class="border"> Yes
</td></tr>
+<tr><td class="border"> 2.2.x </td><td class="border"> 2.2.2-SNAPSHOT
</td><td class="border"> Albert Lee </td><td class="border"> Yes </td></tr>
+<tr><td class="border"> 2.2.1.x </td><td class="border"> 2.2.1.1-SNAPSHOT
</td><td class="border"> Heath Thomann, Albert Lee </td><td class="border">
Yes </td></tr>
+<tr><td class="border"> trunk </td><td class="border"> 2.3.0-SNAPSHOT
</td><td class="border"> N/A \*</td><td class="border"> No </td></tr>
</table>
**\*** There are no formal releases for these branches.
|