Commit Graph
10472 Commits
Author SHA1 Message Date
Adrian Crum 684d49d8b1 Updated the Hypersonic SQL support in the entity engine.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1529644 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 16:35:50 +00:00
Adrian Crum a04a0a2746 Increased the "url" field type to 2000 characters.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1529637 13f79535-47bb-0310-9956-ffa450edef68
2013-10-06 15:57:31 +00:00
Jacques Le Roux a878016f4e No functional changes, just better log info
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1528882 13f79535-47bb-0310-9956-ffa450edef68
2013-10-03 14:17:44 +00:00
Jacopo Cappellato 42225c7cb0 Improved label translation for the English language.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1527997 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 09:33:37 +00:00
Jacques Le Roux 946163e034 Completes r1527956
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1527981 13f79535-47bb-0310-9956-ffa450edef68
2013-10-01 09:09:46 +00:00
Adrian Crum 91294728c2 Fixed a problem with bad try-catch-finally nesting and transaction handling in GenericDelegator.
1. The only exception caught was GenericEntityException, so any other thrown exception was missed - meaning the transaction was committed and GenericDelegator acted as if nothing was wrong.

2. The commit was performed in the finally block, so it was ALWAYS performed - even after an exception was thrown and the transaction was rolled back.

We managed to get away with this all along because typically there is a wrapping transaction that clears it all up. But still, the Delegator code needs to handle transactions correctly.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1527810 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 22:43:02 +00:00
Adam Heath 7b3d3f6be9 There are some controller.xml entries that have a name of "none"; those
should be preferred as valid responses, instead of always assuming that
none means do nothing.

This fixes the issue reported in OFBIZ-5304.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1527754 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 19:57:13 +00:00
Adrian Crum d64e8c0c7c Fixed a subtle flaw in the GenericDelegator.findOne method. When a database query returns no result, GenericValue.NULL_VALUE is put in the pk cache - so future findOne calls will know the entity value doesn't exist. But the findOne method never checked for GenericValue.NULL_VALUE in cache gets, so the database was queried again for an entity value we already know doesn't exist.
https://issues.apache.org/jira/browse/OFBIZ-5332


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1527626 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 16:13:03 +00:00
Adrian Crum 8117cb5756 Small change to GenericDelegator.findOne method - moved the primary key validation check to the beginning of the method.
I believe the original intention was to perform the validation check after the EV_VALIDATE ECAs were run, but the primary key was being used in three method calls before that happened - so those methods could have been passed an invalid primary key.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1527609 13f79535-47bb-0310-9956-ffa450edef68
2013-09-30 15:15:35 +00:00
Adrian Crum 55f80f4fd9 Replaced HashSet with LinkedHashSet in UtilMisc.java to preserve original ordering. Suggested by Leon on the dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1527212 13f79535-47bb-0310-9956-ffa450edef68
2013-09-28 18:24:53 +00:00
Jacques Le Roux 438fb59265 Puts a better comment in templates/web.xml
Remove useless and confusing websiteId in web.xml files

I did not remove some others, but I believe they don't make sense as they are.
Take for instance those data
<WebSite webSiteId="EBAY_STORE1" siteName="eBay Store1" standardContentPrefix="http://demo.ofbiz.org" productStoreId="90101"/>
<WebSite webSiteId="EBAY_STORE2" siteName="eBay Store2" standardContentPrefix="http://demo.ofbiz.org" productStoreId="90102"/>
<WebSite webSiteId="GOOGLEBASE" standardContentPrefix="http://demo.ofbiz.org" productStoreId="9000" />

Sorry but http://demo.ofbiz.org/ leads nowhere!

And do we need to keep those referring to productStoreId="9000" in web.xml files? They have not their own webapps
<WebSite webSiteId="CmsSite" siteName="CMS Web Site"/>
<WebSite webSiteId="OfbizSite" siteName="OFBiz Web Site"/>
<WebSite webSiteId="GOOGLECHECKOUT" productStoreId="9000" />
<WebSite webSiteId="GOOGLECHECKOUT" productStoreId="9000" />

I think we should keep in web.xml files, only ecommerce/clone and webPos (uses POS store)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526686 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 21:07:10 +00:00
Jacques Le Roux 0ef1ff543e Reverts revisions: 1525909 + 1526533 + 1526560, OFBIZ-4794 is not yet ready
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526583 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 15:44:40 +00:00
Jacques Le Roux 59f4630664 Set different ports for testing in a CI environment (e.g. Jenkins) https://issues.apache.org/jira/browse/OFBIZ-4794
Complete previous work because of INFRA-6790

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526533 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 14:58:47 +00:00
Jacques Le Roux 9007023c7f A patch from Leon for "trivial errors corrections to fieldlookup.js" https://issues.apache.org/jira/browse/OFBIZ-5330
Correct following trivial issues:
1. in lookupDescriptionLoaded.prototype.update, not assign the form when try to get filed object by its name
2. in setSourceColor, variable "target" should be given parameter "src"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526456 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 12:15:52 +00:00
Jacques Le Roux 53ccd2ceb7 Fixes "Overview of routings does not paginate" https://issues.apache.org/jira/browse/OFBIZ-5322 and more
Actually it does paginate but the value is not dependent on widget property widget.form.defaultViewSize which default value is 20. It uses a default value of 50 which is defined by

<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="3"/>

You can easily test it using https://localhost:8443/manufacturing/control/FindRouting?VIEW_SIZE=3

This is legacy from pre Apache era. I found 143 cases where a default-value is defined in screens for VIEW_SIZE.

I did not look into details for the 143 cases but I believe most are also legacy.
There are few default values: 10, 20, 30, 50, 500 and even an extreme case of 10000 for InventoryItemTotalsExport!
There is only one comment for LookupBulkAddProducts which is also legacy: <!-- 10 rows seems more appropriate given screen size, etc. -->

I suggest to OOTB replace all those by the widget.form.defaultViewSize value.
Things will then be consistent and easily changeable on a global scale using the widget property.
Or if really needed forcing the default-value as it's done now.

So this would be applied on the 143 cases (I checked, viewSizeDefaultValue does not exist in any screen)

<property-to-field resource="widget" property="widget.form.defaultViewSize" field="viewSizeDefaultValue"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="${viewSizeDefaultValue}"/>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526387 13f79535-47bb-0310-9956-ffa450edef68
2013-09-26 05:55:32 +00:00
Adrian Crum 0f5a7c45e0 Moved one entity-resource definition in the common component - so all geo-related definitions are in one group. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526299 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:58:09 +00:00
Adrian Crum 58bdfa3254 Remove dependency of webapp component on geo-related entities. This will make it easier to exclude geo-related functionality in a framework-only installation.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526298 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:51:33 +00:00
Adrian Crum 359e19722c Move geo-related seed data to the GeoData.xml file. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526296 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:46:40 +00:00
Adrian Crum 6c40bc0c3b Reorganized some Geo-related service definitions. No functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526292 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 20:35:58 +00:00
Adrian Crum 7df7c9952f Fixed a warning caused by a framework dependency on the Party component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526276 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 19:57:13 +00:00
Adrian Crum d5511e39cd Small code cleanup and optimization in ModelEntityChecker.java.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1526226 13f79535-47bb-0310-9956-ffa450edef68
2013-09-25 16:44:16 +00:00
Jacques Le Roux c86a579cf8 Set different ports for testing in a CI environment (e.g. Jenkins) https://issues.apache.org/jira/browse/OFBIZ-4794
*What's for?*
OOTB the port offset is interesting in at least 3 cases:
# To simultaneously run tests on the same Buildbot machine. This is related to http://mail-archives.apache.org/mod_mbox/www-builds/201209.mbox/%3C002101cd991b$0a16de50$1e449af0$@16degrees.com.au%3E
# To simultaneously run the demos without having to change much things, just one parameter
# To eventually run Sonar on OFBiz sources https://issues.apache.org/jira/browse/INFRA-3590

*How it's done?*
Basically, I just added a portoffset integer parameter to some ant targets (of course this JVM param can also be used in a Java call from command line):
* in trunk and R13.07: start, start-batch, start-debug, start-pos, start-both, run-tests and run-test
* in R12.04 and R11.04: run-tests, run-test. I did not set start targets because anyway it would miss the admin port offset, withouh much changes. So can't be used to demonstrate. We will continue to use the current paches for those.

The portoffset parameter is set to zero by default in ClassLoaderContainer.java. 
If a value is passed, it's then grabed by Config.java and passed to ClassLoaderContainer.java, where it's set to this value.

 The portoffset is then used to change in one shoot all the default ports values defined (in config or hardcoded), and the admin port value in R13.07 and trunk.
This is done in following classes:
CatalinaContainer
NamingServiceContainer
ServiceEngine through ServiceLocation
RmiServiceContainer
XMLRPCClientEngine
XmlRpcTests

To avoid hardcoding locations in services definitions, I also had to create some service-locations: main-local-soap and main-remote-soap 

*What are the constraints?*
* For demos: the offset should not be applied to trunk because <service-location name="main-remote-soap" location="http://demo-trunk.ofbiz.apache.org:8080/webtools/control/SOAPService"/> is used for tests by trunk *and all releases*. It's useless to apply to trunk anyway,  offsetting port in releases is enough.
* I did not take into account the Ideal payment harcoded port values in IdealPaymentServiceTest.java. Weirdly I did not cross error during tests, though it seems there are tests using an harcoded port in url.

*What is the status?*
Locally (on Win XP)  I ran many tests combinations with <<ant load-demo run-tests>>.  
Applying the portoffset on a sole running test instance has no effects. I have still some fails (no errors) but those are not related to my changes, they appear also without.
But when I run a combination of any releases/trunk but with R11.04, I get a time out error with testSOAPSimpleService, that I can't explain so far. 
If I run the trunk alone with the portoffset no errors occur. Same if I run a release with portoffset and only testSOAPSimpleService in trunk (w/ or w/o portoffset)

*To summarize:* these changes will be used to run Buildot tests instances simultaneously . And, for coming releases, to run demos without having to create patches. Simply running ant start with a portoffset value which will take care of all ports values, including admin port. For running R12.04 demo as stable we will still need to create a patch for the last time.

*What I will to do for now:* commit the patches and test if I cross the same issue on Buildbot. If it's the same (99% chances it will) I will revert and will continue to locally try to find the reason . I believe this issue is unrelated to the changes I implemened.  And it's just because it's now possible to simultaneously run tests that it appears. 

BTW I just noticed that when you run R11.04 with R12.04, R12.04 takes almost all the CPU (XP is not very, while when running any combinations w/o R11.04 the CPU load is shared. 
Also there are far less tests in R11.04, which coul be the reason when I run it with another test run instance there are no issues.  Because R11.04 tests finish before the other instance gets to run testSOAPSimpleService.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1525909 13f79535-47bb-0310-9956-ffa450edef68
2013-09-24 14:47:30 +00:00
Adrian Crum 452b13f2a3 Fixed a bug in the menu widget rendering.
https://issues.apache.org/jira/browse/OFBIZ-5326


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1525605 13f79535-47bb-0310-9956-ffa450edef68
2013-09-23 14:32:32 +00:00
Jacopo Cappellato 367ac26332 Upgraded Fop to 1.1 (the latest bug fix release) and barcode4j to 2.1 (version compatible with Fop 1.1).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524835 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 20:47:37 +00:00
Jacques Le Roux ff5f0a5096 A patch for "Deprecate doCacheClear in Delegator interface and class and related minilang classes" https://issues.apache.org/jira/browse/OFBIZ-5325
* Deprecates methods in Delegator interface and class
* Deprecates cache clear related variable and methods in EntitySaxReader class
* Deprecates cache clear related variables in minilang related delegator classes
* In simple-method schema annotations, marks do-cache-clear attribute as deprecated 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524704 13f79535-47bb-0310-9956-ffa450edef68
2013-09-19 12:03:47 +00:00
Adrian Crum 572ac66d16 Minor change to GenericDelegator - Put some logging calls inside if blocks.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524183 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 19:17:49 +00:00
Adrian Crum 252de4230f Fixed a bug in menu rendering, reported by Jacques on the dev mailing list.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524143 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 17:58:13 +00:00
Adrian Crum 8004ad04c2 JavaDoc fix - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524134 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 17:17:56 +00:00
Adrian Crum 0e1449137d Small improvement to String-to-Date conversion: Accept either JDBC escape format or localized format.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524133 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 17:16:50 +00:00
Adrian Crum c276d17fa4 Small change to ObjectType.java - log warning on conversion failures so we can see what went wrong.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524132 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 17:15:20 +00:00
Adrian Crum ecb1c8e8d6 Fix a trivial compiler warning - no functional change.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1524131 13f79535-47bb-0310-9956-ffa450edef68
2013-09-17 17:13:52 +00:00
Jacopo Cappellato f77307f71e Removed commented out lines created for test purposes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523739 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 18:13:51 +00:00
Jacques Le Roux 53343461e0 Since we decided to keep findAll, no reasons to deprecate
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523645 13f79535-47bb-0310-9956-ffa450edef68
2013-09-16 13:38:08 +00:00
Jacques Le Roux ca73e7694e As suggested on dev ML, reintroduces findAll("EntityName") but uses the new pattern with a cache variable rather than a signature with "Cache" in method name (thanks to Adrian's comment on dev ML)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523507 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 21:58:38 +00:00
Jacques Le Roux d54e2f098c As suggested on dev ML, reintroduce findAll("EntityName"), I decided that findAllCache("EntityName") could be also. If you disagree on findAllCache, just remove it...
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523466 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 17:53:43 +00:00
Jacques Le Roux c70c41921d "Fix online help issues" https://issues.apache.org/jira/browse/OFBIZ-5320
This fixes most of the issues but some are remaining, I report them in OFBIZ-5320

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1523423 13f79535-47bb-0310-9956-ffa450edef68
2013-09-15 09:41:28 +00:00
Jacques Le Roux 5c4bb0a2b4 Reverts r1518777
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1522675 13f79535-47bb-0310-9956-ffa450edef68
2013-09-12 17:36:45 +00:00
Adrian Crum ac4f89935d Trivial improvement to log message: Add a stack trace.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1522006 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 19:39:34 +00:00
Adrian Crum 67225263bb Refactored MacroScreenViewHandler.java so it doesn't require empty "do nothing" templates.
https://issues.apache.org/jira/browse/OFBIZ-5310


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1522002 13f79535-47bb-0310-9956-ffa450edef68
2013-09-11 19:31:14 +00:00
Jacques Le Roux ba5dc0cfea For "Order Report Issue" https://issues.apache.org/jira/browse/OFBIZ-5297
The quickInitDataWarehouse BI button used these dates (set in BI main screen)

<set field="fromDate" value="2008-01-01 00:00:00.0" type="Timestamp"/>
<set field="thruDate" value="2010-01-01 00:00:00.0" type="Timestamp"/>

This generated 1000+ records. I set 10 years ahead (from sept. 2013) in a new bi.properties file used by the BI main screen. So it generates only 3000+ records (and others related in BI DB) which is still reasonable. A message, placed at the top of the Order Reports page, informs users that for 4 Birt reports s/he needs 1st to run the data warehouse init using the BI button. Also this message clarifies the range, to be certain that in 10 years people will still easily know what to change...

I have also replaced a lot of labels and added English and French translations (by-product: some labels cleaning in CommonUiLabels.xml)

I did not do the same for the accounting paymentReport and ViewFacilityInventoryHistoryReport facility Birt reports which only need translation. 
I noticed that there are no ways to get to ViewFacilityInventoryHistoryReport from UI though!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1521589 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 19:08:29 +00:00
Hans Bakker 8d58d0d9e9 remove typing error
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1521348 13f79535-47bb-0310-9956-ffa450edef68
2013-09-10 02:07:53 +00:00
Hans Bakker 7be06f2f43 small improvements of the programmable database export
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1520954 13f79535-47bb-0310-9956-ffa450edef68
2013-09-09 03:10:00 +00:00
Jacopo Cappellato 07934c65d3 Simplified the layout of the main/framework/applications/specialpurpose build files; now the files:
framework/build.xml
applications/build.xml
specialpurpose/build.xml

are only used to define the filelist properties (as before) with the list of components to be built.
The main build file simply refers to these lists to build/doc/clean OFBiz; as before, if applications' or specialpurpose's build.xml files are absent, the folders are ignored.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1520744 13f79535-47bb-0310-9956-ffa450edef68
2013-09-07 09:27:59 +00:00
Jacopo Cappellato 60fdfcbfa8 First pass of the cleanup of Ant's targets defined in main build file and in build files for framework/applications/specialpurpose folders:
* removed redundant targets (e.g. clean-xtras)
* removed unused targets and settings
* moved runtime related targets from framework to main build file
* moved the search index runtime folder from runtime/data/indexes to runtime/indexes to prevent the removal of indexes when clean-data is executed



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1520510 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 08:32:47 +00:00
Hans Bakker 2908317017 added a new menu item in webtools: 'programmable export' where interactively a groovy program can be entered to export specifc records from the database. In order to apply some global changes for re-import
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1520505 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 08:03:34 +00:00
Jacopo Cappellato c33e39550c Implemented the ability to specify an event (success) message in Groovy events when success(GString) is invoked.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1520319 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 14:07:05 +00:00
Jacques Le Roux 251558ca8c Better to have this in doc than in a comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1520249 13f79535-47bb-0310-9956-ffa450edef68
2013-09-05 08:23:59 +00:00
Jacopo Cappellato 3911dc9aeb Removed parameter from the catalina-container setup that is deprecated:
public void setResolveHosts(boolean resolveHosts)
Deprecated. Unused, removed in Tomcat 8. See org.apache.catalina.connector.Connector.setEnableLookups(boolean).

and according to the above notes I have enabled the same behavior using the enableLookups flag in the Connectors.
This change resolves a warning during compilation but requires more testing.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1519577 13f79535-47bb-0310-9956-ffa450edef68
2013-09-03 06:20:23 +00:00
Jacques Le Roux 2df6fadcbe I made a wrong C/P for Åland islands, I checked no others
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1518950 13f79535-47bb-0310-9956-ffa450edef68
2013-08-30 12:19:56 +00:00
Jacques Le Roux d6eaefbeb6 This fixes "Net before overhead report generates an error" https://issues.apache.org/jira/browse/OFBIZ-5267
This is related with r1361130, where the birt component was moved from framework to specialpurpose.

The fix is to create the possibility of a loose coupling from applications controllers to specialpurpose controllers. For that an if-present attribute is added to the include element. When used, if the included controller does not exist, instead of an error and a stack trace, a warning is thrown (only in English, for developers) suggesting to checkout the component from trunk. Indeed, in the current case, this situation should only arise in release after 12.04 where the birt component, like all others but the ecommerce component, had been removed. This can be used in other cases, but for now only the component level is covered.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1518777 13f79535-47bb-0310-9956-ffa450edef68
2013-08-29 19:37:44 +00:00