Author: dkulp
Date: Mon Jun 29 19:52:21 2009
New Revision: 789425
URL: http://svn.apache.org/viewvc?rev=789425&view=rev
Log:
Merged revisions 789387 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r789387 | dkulp | 2009-06-29 13:13:19 -0400 (Mon, 29 Jun 2009) | 1 line
Put file that is apparently referenced from some spring configs back
........
Added:
cxf/branches/2.2.x-fixes/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
- copied unchanged from r789387,
cxf/trunk/rt/frontend/js/src/main/java/org/apache/cxf/js/rhino/JsServiceFactoryBean.java
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 29 19:52:21 2009
@@ -1 +1 @@
-/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371
+/cxf/trunk:782728-782730,783097,783294,783396,784059,784181-784184,784893,784895,785279-785282,785468,785621,785624,785651,785734,785866,786142,786271-786272,786395,786512,786514,786582-786583,786638,786647,786850,787200,787269,787277-787279,787290-787291,787305,787323,787366,787849,788030,788060,788187,788444,788451,788703,788752,788774,788819-788820,789013,789371,789387
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
