svn commit: r1231507 [2/3] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1231507 [2/3] - in /ofbiz/branches/jackrabbit2010
 
|
Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/EditCategory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/EditCategory.ftl?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/catalog/category/EditCategory.ftl Sat Jan 14 14:40:09 2012 @@ -96,15 +96,15 @@ function insertImageName(type,nameValue) <td> </td> <td width="74%"> <select name="productCategoryTypeId" size="1"> - <#assign selectedKey = ""> - <#list productCategoryTypes as productCategoryTypeData> - <#if requestParameters.productCategoryTypeId?has_content> - <#assign selectedKey = requestParameters.productCategoryTypeId> - <#elseif (productCategory?has_content && productCategory.productCategoryTypeId?if_exists == productCategoryTypeData.productCategoryTypeId)> - <#assign selectedKey = productCategory.productCategoryTypeId> - </#if> - <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId?if_exists>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option> - </#list> + <#assign selectedKey = ""> + <#list productCategoryTypes as productCategoryTypeData> + <#if requestParameters.productCategoryTypeId?has_content> + <#assign selectedKey = requestParameters.productCategoryTypeId> + <#elseif (productCategory?has_content && productCategory.productCategoryTypeId?if_exists == productCategoryTypeData.productCategoryTypeId)> + <#assign selectedKey = productCategory.productCategoryTypeId> + </#if> + <option <#if selectedKey == productCategoryTypeData.productCategoryTypeId?if_exists>selected="selected"</#if> value="${productCategoryTypeData.productCategoryTypeId}">${productCategoryTypeData.get("description",locale)}</option> + </#list> </select> </td> </tr> Modified: ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy Sat Jan 14 14:40:09 2012 @@ -77,6 +77,14 @@ if (picklistBinId) { } } +if (orderId && !picklistBinId) { + picklistBin = EntityUtil.getFirst(delegator.findByAnd("PicklistBin", [primaryOrderId : orderId])); + if (picklistBin) { + picklistBinId = picklistBin.picklistBinId; + verifyPickSession.setPicklistBinId(picklistBinId); + } +} + context.orderId = orderId; context.shipGroupSeqId = shipGroupSeqId; context.picklistBinId = picklistBinId; Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/CommonScreens.xml Sat Jan 14 14:40:09 2012 @@ -156,7 +156,7 @@ under the License. <if-compare operator="not-equals" value="EditProductStore" field="tabButtonItem"/> </condition> <widgets> - <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> </widgets> </section> </fail-widgets> @@ -398,4 +398,36 @@ under the License. </widgets> </section> </screen> + + <screen name="ProductStoreFacilities"> + <section> + <actions> + <set field="productStoreId" from-field="parameters.productStoreId"/> + <entity-one entity-name="ProductStore" value-field="productStore"/> + <set field="tabButtonItem" value="EditProductStoreFacilities"/> + <set field="labelTitleProperty" value="ProductFacility"/> + <set field="headerItem" value="store"/> + </actions> + <widgets> + <decorator-screen name="main-decorator"> + <decorator-section name="left-column"> + <include-screen name="leftbar"/> + </decorator-section> + <decorator-section name="body"> + <section> + <condition><not><if-empty field="productStore"/></not></condition> + <widgets> + <container> + <include-menu name="ProductStoreTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <include-menu name="ProductStoreSubTabBar" location="component://product/widget/catalog/CatalogMenus.xml"/> + <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productStore.storeName} [${uiLabelMap.CommonId}:${productStoreId}] ${${extraFunctionName}}</label> + </container> + <include-portal-page id="ProductStoreFacility"/> + </widgets> + </section> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureForms.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/FeatureForms.xml Sat Jan 14 14:40:09 2012 @@ -315,7 +315,7 @@ </hyperlink> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field> - <field name="update" title="${uiLabelMap.CommonUpdate}"><submit/></field> + <field name="update" title="${uiLabelMap.CommonUpdate}"><submit/></field> </form> <form name="CreateProductFeature" type="single" target="CreateFeatureCategory"> Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/StoreScreens.xml Sat Jan 14 14:40:09 2012 @@ -554,51 +554,23 @@ under the License. </screen> <!-- Assoc with product --> - <screen name="ProductStoreFacilities"> + <screen name="ListProductStoreFacility"> <section> <actions> <set field="titleProperty" value="ProductStoreFacilityAssocList"/> - <set field="headerItem" value="store"/> <set field="tabButtonItem" value="EditProductStoreFacilities"/> <set field="productStoreId" from-field="parameters.productStoreId"/> + <set field="portalPageId" value="ProductStoreFacility"/> </actions> <widgets> - <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-portal-page id="ProductStoreFacility"/> - </decorator-section> - </decorator-screen> - </widgets> - </section> - </screen> - <screen name="ListProductStoreFacility"> - <section> - <widgets> + <container id="ProductStoreFacilityEditArea"/> <screenlet title="${uiLabelMap.ProductStoreFacilityAssocList}" navigation-menu-name="ProductStoreFacility"> <include-menu name="ProductStoreFacility" location="component://product/widget/catalog/CatalogMenus.xml"/> - <container id="PrdStoreFacilityMgmtArea"> - <decorator-screen name="CommonProductStoreDecorator" location="${parameters.mainDecoratorLocation}"> - <decorator-section name="body"> - <include-screen name="ListProductStoreFacilityFormOnly"/> - </decorator-section> - </decorator-screen> - </container> + <include-form name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> </screenlet> </widgets> </section> </screen> - <screen name="ListProductStoreFacilityFormOnly"> - <section> - <actions> - <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> - <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> - </actions> - <widgets> - <container id="ProductStoreFacilityEditArea"/> - <include-form name="ListProductStoreFacility" location="component://product/widget/catalog/StoreForms.xml"/> - </widgets> - </section> - </screen> <screen name="EditProductStoreFacility"> <section> <condition> Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Sat Jan 14 14:40:09 2012 @@ -1662,6 +1662,7 @@ under the License. <condition-list combine="and"> <condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/> <condition-expr field-name="workEffortTypeId" value="PUBLISH_PROPS" operator="not-equals"/> + <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/> <condition-expr field-name="partyId" from-field="assignedParty.partyId"/> </condition-list> </entity-condition> @@ -1675,15 +1676,20 @@ under the License. <condition-list combine="and"> <condition-expr field-name="scopeEnumId" value="WES_PUBLIC"/> <condition-expr field-name="workEffortTypeId" value="PUBLISH_PROPS" operator="not-equals"/> + <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/> <condition-expr field-name="fixedAssetId" from-field="assignedFixedAsset.fixedAssetId"/> </condition-list> </entity-condition> <list-to-list list="resultList" to-list="workEfforts"/> </iterate> - <entity-and list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true"> - <field-map field-name="workEffortIdFrom" from-field="workEffortId"/> - </entity-and> + <entity-condition list="resultList" entity-name="WorkEffortAssocToView" filter-by-date="true"> + <condition-list combine="and"> + <condition-expr field-name="workEffortIdFrom" operator="equals" from-field="workEffortId"/> + <condition-expr field-name="workEffortTypeId" operator="equals" from-field="parameters.workEffortTypeId" ignore-if-empty="true"/> + </condition-list> + </entity-condition> <list-to-list list="resultList" to-list="workEfforts"/> + <set field="workEfforts" from-field="groovy:org.ofbiz.workeffort.workeffort.WorkEffortWorker.removeDuplicateWorkEfforts(workEfforts);" type="List"/> <field-to-result field="workEfforts"/> </simple-method> Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/servicedef/services.xml Sat Jan 14 14:40:09 2012 @@ -766,6 +766,7 @@ under the License. <description>Get iCalendar Work Efforts</description> <!-- No permission checking - the servlet handles that --> <attribute type="String" mode="IN" name="workEffortId" optional="false"/> + <attribute type="String" mode="IN" name="workEffortTypeId" optional="true"/> <attribute type="List" mode="OUT" name="workEfforts"/> </service> <service name="getPartyICalUrl" engine="simple" auth="false" Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortKeywordIndex.java Sat Jan 14 14:40:09 2012 @@ -69,7 +69,7 @@ public class WorkEffortKeywordIndex { if (!"0".equals(UtilProperties.getPropertyValue("workeffortsearch", "index.weight.WorkEffortNoteAndData.noteInfo", "1"))) { List<GenericValue> workEffortNotes = delegator.findByAnd("WorkEffortNoteAndData", UtilMisc.toMap("workEffortId", workEffortId)); - for (GenericValue workEffortNote : workEffortNotes) { + for (GenericValue workEffortNote : workEffortNotes) { addWeightedKeywordSourceString(workEffortNote, "noteInfo", strings); } } Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearch.java Sat Jan 14 14:40:09 2012 @@ -483,7 +483,7 @@ public class WorkEffortSearch { // ====================================================================== @SuppressWarnings("serial") - public static abstract class WorkEffortSearchConstraint implements java.io.Serializable { + public static abstract class WorkEffortSearchConstraint implements java.io.Serializable { public WorkEffortSearchConstraint() { } public abstract void addConstraint(WorkEffortSearchContext workEffortSearchContext); @@ -493,7 +493,7 @@ public class WorkEffortSearch { @SuppressWarnings("serial") - public static class WorkEffortAssocConstraint extends WorkEffortSearchConstraint { + public static class WorkEffortAssocConstraint extends WorkEffortSearchConstraint { public static final String constraintName = "WorkEffortAssoc"; protected String workEffortId; protected String workEffortAssocTypeId; @@ -809,7 +809,7 @@ public class WorkEffortSearch { } @SuppressWarnings("serial") - public static class ProductSetConstraint extends WorkEffortSearchConstraint { + public static class ProductSetConstraint extends WorkEffortSearchConstraint { public static final String constraintName = "ProductSet"; protected Set<String> productIdSet; Modified: ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortSearchSession.java Sat Jan 14 14:40:09 2012 @@ -43,7 +43,7 @@ public class WorkEffortSearchSession { public static final String module = WorkEffortSearchSession.class.getName(); @SuppressWarnings("serial") - public static class WorkEffortSearchOptions implements java.io.Serializable { + public static class WorkEffortSearchOptions implements java.io.Serializable { protected List<WorkEffortSearchConstraint> constraintList = null; protected ResultSortOrder resultSortOrder = null; protected Integer viewIndex = null; Modified: ofbiz/branches/jackrabbit20100709/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/build.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/build.xml (original) +++ ofbiz/branches/jackrabbit20100709/build.xml Sat Jan 14 14:40:09 2012 @@ -936,7 +936,7 @@ under the License. <taskdef resource="tasks.properties"> <classpath> <fileset dir="framework/base/lib"> - <include name="cobertura-1.9.3.jar" /> + <include name="cobertura-1.9.4.1.jar" /> <include name="log4j-1.2.15.jar" /> <include name="scripting/asm*.jar" /> </fileset> @@ -964,7 +964,7 @@ under the License. <taskdef resource="tasks.properties"> <classpath> <fileset dir="framework/base/lib"> - <include name="cobertura-1.9.3.jar" /> + <include name="cobertura-1.9.4.1.jar" /> <include name="log4j-1.2.15.jar" /> <include name="scripting/asm*.jar" /> </fileset> Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/config/CoberturaInstrumenter.java Sat Jan 14 14:40:09 2012 @@ -25,17 +25,16 @@ import java.lang.reflect.Method; import java.util.Collection; import java.util.Collections; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.ClassVisitor; - import net.sourceforge.cobertura.coveragedata.CoverageDataFileHandler; import net.sourceforge.cobertura.coveragedata.ProjectData; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; import org.ofbiz.base.start.Instrumenter; public final class CoberturaInstrumenter implements Instrumenter { - private static final Constructor INSTRUMENTER_CONSTRUCTOR; + private static final Constructor<?> INSTRUMENTER_CONSTRUCTOR; private static final Method IS_INSTRUMENTED_METHOD; static { try { @@ -77,14 +76,18 @@ public final class CoberturaInstrumenter } public byte[] instrumentClass(byte[] bytes) throws IOException { - ClassReader cr = new ClassReader(bytes); - ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS/* | ClassWriter.COMPUTE_FRAMES*/); - try { - ClassVisitor ci = (ClassVisitor) INSTRUMENTER_CONSTRUCTOR.newInstance(projectData != null ? projectData : ProjectData.getGlobalProjectData(), cw, Collections.EMPTY_LIST, Collections.EMPTY_LIST); - cr.accept(ci, 0); - if (((Boolean) IS_INSTRUMENTED_METHOD.invoke(ci)).booleanValue()) return cw.toByteArray(); - } catch (Throwable t) { - throw (IOException) new IOException(t.getMessage()).initCause(t); + if (forInstrumenting) { + ClassReader cr = new ClassReader(bytes); + ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS/* | ClassWriter.COMPUTE_FRAMES*/); + try { + ClassVisitor ci = (ClassVisitor) INSTRUMENTER_CONSTRUCTOR.newInstance(projectData, cw, Collections.EMPTY_LIST, Collections.EMPTY_LIST); + cr.accept(ci, 0); + if (((Boolean) IS_INSTRUMENTED_METHOD.invoke(ci)).booleanValue()) { + return cw.toByteArray(); + } + } catch (Throwable t) { + throw (IOException) new IOException(t.getMessage()).initCause(t); + } } return bytes; } Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ComponentContainer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ComponentContainer.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ComponentContainer.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/container/ComponentContainer.java Sat Jan 14 14:40:09 2012 @@ -136,7 +136,10 @@ public class ComponentContainer implemen // set the new classloader/classpath on the current thread if (updateClasspath) { - classPath.instrument(instrumenterFile, instrumenterClassName); + if (UtilValidate.isNotEmpty(instrumenterFile) && UtilValidate.isNotEmpty(instrumenterClassName)) { + classPath.instrument(instrumenterFile, instrumenterClassName); + } + System.setProperty("java.class.path", classPath.toString()); System.setProperty("java.library.path", libraryPath.toString()); ClassLoader cl = classPath.getClassLoader(); Modified: ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/base/src/org/ofbiz/base/util/cache/UtilCache.java Sat Jan 14 14:40:09 2012 @@ -65,7 +65,7 @@ import com.googlecode.concurrentlinkedha */ @SuppressWarnings("serial") public class UtilCache<K, V> implements Serializable, EvictionListener<Object, CacheLine<V>> { - + public static final String module = UtilCache.class.getName(); /** A static Map to keep track of all of the UtilCache instances. */ @@ -190,11 +190,11 @@ public class UtilCache<K, V> implements public static String getPropertyParam(ResourceBundle res, String[] propNames, String parameter) { try { for (String propName: propNames) { - if(res.containsKey(propName+ '.' + parameter)) { - try { - return res.getString(propName + '.' + parameter); - } catch (MissingResourceException e) {} - } + if(res.containsKey(propName+ '.' + parameter)) { + try { + return res.getString(propName + '.' + parameter); + } catch (MissingResourceException e) {} + } } // don't need this, just return null //if (value == null) { @@ -1032,8 +1032,8 @@ public class UtilCache<K, V> implements return (UtilCache<K, V>) UtilCache.utilCacheTable.get(cacheName); } - @Override - public void onEviction(Object key, CacheLine<V> value) { - ExecutionPool.removePulse(value); - } + @Override + public void onEviction(Object key, CacheLine<V> value) { + ExecutionPool.removePulse(value); + } } Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/UrlServletHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/UrlServletHelper.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/UrlServletHelper.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/UrlServletHelper.java Sat Jan 14 14:40:09 2012 @@ -55,7 +55,6 @@ public class UrlServletHelper extends Co // get tenant delegator by domain name String serverName = request.getServerName(); try { - // if tenant was specified, replace delegator with the new per-tenant delegator and set tenantId to session attribute delegator = getDelegator(servletContext); List<GenericValue> tenants = delegator.findList("Tenant", EntityCondition.makeCondition("domainName", serverName), null, UtilMisc.toList("-createdStamp"), null, false); Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/listVisualThemes.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/listVisualThemes.ftl?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/listVisualThemes.ftl (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/includes/listVisualThemes.ftl Sat Jan 14 14:40:09 2012 @@ -34,11 +34,11 @@ margin: 1em; 'hideOnContentClick': true }); $("a.group").fancybox({ - 'transitionIn' : 'elastic', - 'transitionOut' : 'elastic', - 'speedIn' : 600, - 'speedOut' : 200, - 'overlayShow' : false + 'transitionIn' : 'elastic', + 'transitionOut' : 'elastic', + 'speedIn' : 600, + 'speedOut' : 200, + 'overlayShow' : false }); }); </script> Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml Sat Jan 14 14:40:09 2012 @@ -543,7 +543,7 @@ under the License. <widgets> <decorator-screen name="LookupDecorator"> <decorator-section name="body"> - <label>${uiLabelMap.CommonSessionTimeoutPleaseLogIn}</label> + <link target="checkLogin" text="${uiLabelMap.CommonSessionTimeoutPleaseLogIn}"/> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/PortalPageScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/PortalPageScreens.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/PortalPageScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/PortalPageScreens.xml Sat Jan 14 14:40:09 2012 @@ -101,9 +101,9 @@ under the License. <decorator-section name="body"> <screenlet id="PortalPagesList" title="${uiLabelMap.CommonPortalPagesForApplication}: ${parameters.parentPortalPageId}" collapsible="true"> <container style="button-bar"> - <link target="NewPortalPage" text="${uiLabelMap.CommonNewPortalPage}" style="buttontext create"> - <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> - </link> + <link target="NewPortalPage" text="${uiLabelMap.CommonNewPortalPage}" style="buttontext create"> + <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> + </link> </container> <include-form name="ListPortalPages" location="component://common/widget/PortalPageForms.xml"/> </screenlet> Modified: ofbiz/branches/jackrabbit20100709/framework/documents/DataFiles.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/documents/DataFiles.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/documents/DataFiles.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/documents/DataFiles.xml Sat Jan 14 14:40:09 2012 @@ -46,9 +46,9 @@ <title>How to use the "Work With Data Files" screen in the Webtools application</title>_Prerequisites_: a definition file (containing the fields' definition of the data file) and a data file (containing the data you want to parse/import) should be available in the OFBiz server.Steps: - <step performance="required"> + <step performance="required"> <para> - connect to the Webtools application + connect to the Webtools application </para> </step> <step performance="required"> @@ -98,9 +98,9 @@ enter a path for it in the "Save to enti </section> <section>The field.name attribute must contain the name of the entity field in which the records will be imported - (for example<programlisting><![CDATA[:<field name="productId" type="String"> - </field> - ]]></programlisting> + (for example<programlisting><![CDATA[:<field name="productId" type="String"> + </field> + ]]></programlisting> </section> <section> <title>Examples</title> @@ -136,52 +136,52 @@ enter a path for it in the "Save to enti </record> </data-file> </data-files> - ]]></programlisting> + ]]></programlisting> </example> - The types listed in this sample are simple String's but the usual types are available such as Date, Long etc + The types listed in this sample are simple String's but the usual types are available such as Date, Long etc </section> <section> <example> <title>Another example reading fixed record little endian binary files</title> <programlisting><![CDATA[ - <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768"> - <record name="stockdataitem" limit="many"> - <field name="barcode" type="NullTerminatedString" length="12" position="0"> - </field> - <field name="prodCode" type="NullTerminatedString" length="12" position="68"> - </field> - <field name="price" type="LEInteger" length="4" position="80"> - </field> - <field name="name" type="NullTerminatedString" length="30" position="16"> - </field> - </record> - </data-file> - </data-files> - ]]></programlisting> + <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768"> + <record name="stockdataitem" limit="many"> + <field name="barcode" type="NullTerminatedString" length="12" position="0"> + </field> + <field name="prodCode" type="NullTerminatedString" length="12" position="68"> + </field> + <field name="price" type="LEInteger" length="4" position="80"> + </field> + <field name="name" type="NullTerminatedString" length="30" position="16"> + </field> + </record> + </data-file> + </data-files> + ]]></programlisting> </example> <procedure> <title>In the interface enter something like:</title> - <step performance="required"> + <step performance="required"> <para> - Definition Filename or URL: posschema.xml + Definition Filename or URL: posschema.xml </para> </step> <step performance="required"> <para> - Data File Definition Name: posreport + Data File Definition Name: posreport </para> </step> <step performance="required"> <para> - Data Filename or URL: posreport.csv + Data Filename or URL: posreport.csv </para> </step> - + </procedure> </section> </section> @@ -190,51 +190,50 @@ enter a path for it in the "Save to enti <title>Sample xml definition file for importing select columns posschema.xml:</title> <programlisting><![CDATA[ - <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <data-file name="posreport" separator-style="fixed-length" type-code="text"> - <record name="tillentry" limit="many"> - <field name="tillCode" type="String" length="16" position="0"> - </field> - <field name="name" type="String" length="32" position="17"> - </field> - <field name="prodCode" type="String" length="12" position="63"> - </field> - <field name="quantity" type="String" length="8" position="76"> - </field> - <field name="totalPrice" type="String" length="8" position="85"> - </field> - </record> - </data-file> - </data-files> - ]]></programlisting> + <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <data-file name="posreport" separator-style="fixed-length" type-code="text"> + <record name="tillentry" limit="many"> + <field name="tillCode" type="String" length="16" position="0"> + </field> + <field name="name" type="String" length="32" position="17"> + </field> + <field name="prodCode" type="String" length="12" position="63"> + </field> + <field name="quantity" type="String" length="8" position="76"> + </field> + <field name="totalPrice" type="String" length="8" position="85"> + </field> + </record> + </data-file> + </data-files> + ]]></programlisting> </example> - - In the interface enter something like:* Definition Filename or URL: posschema.xml* Data File Definition Name: posreport* Data Filename or URL: posreport.csvThe types listed in this sample are simple String's but the usual types are available such as Date, Long etc. + + In the interface enter something like:* Definition Filename or URL: posschema.xml* Data File Definition Name: posreport* Data Filename or URL: posreport.csvThe types listed in this sample are simple String's but the usual types are available such as Date, Long etc. </section> <section> <example> <title> Another example reading fixed record little endian binary files</title> <programlisting><![CDATA[ - <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768"> - <record name="stockdataitem" limit="many"> - <field name="barcode" type="NullTerminatedString" length="12" position="0"> - </field> - <field name="prodCode" type="NullTerminatedString" length="12" position="68"> - </field> - <field name="price" type="LEInteger" length="4" position="80"> - </field> - <field name="name" type="NullTerminatedString" length="30" position="16"> - </field> - </record> - </data-file> - </data-files> - ]]></programlisting> + <data-files xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/datafiles.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <data-file name="stockdata" separator-style="fixed-record" type-code="text" record-length="768"> + <record name="stockdataitem" limit="many"> + <field name="barcode" type="NullTerminatedString" length="12" position="0"> + </field> + <field name="prodCode" type="NullTerminatedString" length="12" position="68"> + </field> + <field name="price" type="LEInteger" length="4" position="80"> + </field> + <field name="name" type="NullTerminatedString" length="30" position="16"> + </field> + </record> + </data-file> + </data-files> + ]]></programlisting> </example> </section> </section> </chapter> - Modified: ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleForms.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleForms.xml Sat Jan 14 14:40:09 2012 @@ -104,7 +104,7 @@ under the License. <field use-when="example!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="example==null @and exampleId==null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><ignored/></field> <field use-when="example==null @and exampleId!=null" name="exampleId" title="${uiLabelMap.ExampleExampleId}"><display description="${uiLabelMap.CommonCannotBeFound}: [${exampleId}]" also-hidden="false"/></field> - <field name="exampleTypeId" title="${uiLabelMap.CommonType}" id-name="exampleTypeId"> + <field name="exampleTypeId" title="${uiLabelMap.CommonType}" id-name="exampleTypeId" widget-style="required"> <drop-down allow-empty="false"> <!-- this is a neat feature, but not good for the type because the user would have to know the possible types in order to enter at least the first letter, so leaving it out by default; just uncomment to enable: <auto-complete/> --> <entity-options entity-name="ExampleType" description="${description}"> @@ -112,18 +112,19 @@ under the License. </entity-options> </drop-down> </field> - <field name="statusId" use-when="example==null" title="${uiLabelMap.CommonStatus}"> + <field name="statusId" use-when="example==null" title="${uiLabelMap.CommonStatus}" widget-style="required"> <drop-down allow-empty="false"> <entity-options entity-name="ExampleStatusItem" description="${description}"/> </drop-down> </field> - <field name="statusId" use-when="example!=null" title="${uiLabelMap.CommonStatus}"> + <field name="statusId" use-when="example!=null" title="${uiLabelMap.CommonStatus}" widget-style="required"> <drop-down allow-empty="false" current-description="${currentStatus.description}"> <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})"> <entity-constraint name="statusId" env-name="example.statusId"/> </entity-options> </drop-down> </field> + <field name="exampleName" required-field="true" widget-style="required"></field> <field name="description" title="${uiLabelMap.CommonDescription}"/> <field name="longDescription" title="${uiLabelMap.ExampleLongDescription}"/> <field name="anotherText"> Modified: ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/InstrumenterWorker.java Sat Jan 14 14:40:09 2012 @@ -71,7 +71,7 @@ public final class InstrumenterWorker { e.printStackTrace(); return srcPaths; } catch (ClassNotFoundException e) { - e.printStackTrace(); + System.err.println("InstrumenterWorker.instrument - Code instrumentation has been disabled, unable to find instrumenter class " + instrumenterClassName); return srcPaths; } ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(ManagementFactory.getOperatingSystemMXBean().getAvailableProcessors()); Modified: ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/start/src/org/ofbiz/base/start/Start.java Sat Jan 14 14:40:09 2012 @@ -236,10 +236,10 @@ public class Start { } private String sendSocketCommand(String command) throws IOException, ConnectException { - String response = "OFBiz is Down"; - - try { - Socket socket = new Socket(config.adminAddress, config.adminPort); + String response = "OFBiz is Down"; + + try { + Socket socket = new Socket(config.adminAddress, config.adminPort); // send the command PrintWriter writer = new PrintWriter(socket.getOutputStream(), true); Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java Sat Jan 14 14:40:09 2012 @@ -265,12 +265,12 @@ public class HtmlMenuRenderer extends Ht appendWhitespace(writer); } if (modelMenu.renderedMenuItemCount(context) > 0) { - writer.append("<ul>"); - appendWhitespace(writer); - writer.append("<li>"); - appendWhitespace(writer); - writer.append(" <ul>"); - appendWhitespace(writer); + writer.append("<ul>"); + appendWhitespace(writer); + writer.append("<li>"); + appendWhitespace(writer); + writer.append(" <ul>"); + appendWhitespace(writer); } } @@ -278,19 +278,19 @@ public class HtmlMenuRenderer extends Ht * @see org.ofbiz.widget.menu.MenuStringRenderer#renderMenuClose(java.io.Writer, java.util.Map, org.ofbiz.widget.menu.ModelMenu) */ public void renderMenuClose(Appendable writer, Map<String, Object> context, ModelMenu modelMenu) throws IOException { - // TODO: div can't be directly inside an UL + // TODO: div can't be directly inside an UL String fillStyle = modelMenu.getFillStyle(); if (UtilValidate.isNotEmpty(fillStyle)) { writer.append("<div class=\"").append(fillStyle).append("\"> </div>"); } //String menuContainerStyle = modelMenu.getMenuContainerStyle(context); if (modelMenu.renderedMenuItemCount(context) > 0) { - writer.append(" </ul>"); - appendWhitespace(writer); - writer.append("</li>"); - appendWhitespace(writer); - writer.append("</ul>"); - appendWhitespace(writer); + writer.append(" </ul>"); + appendWhitespace(writer); + writer.append("</li>"); + appendWhitespace(writer); + writer.append("</ul>"); + appendWhitespace(writer); } writer.append(" <br class=\"clear\"/>"); appendWhitespace(writer); @@ -599,7 +599,3 @@ public class HtmlMenuRenderer extends Ht writer.append("/>"); } } - - - - Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/menu/ModelMenu.java Sat Jan 14 14:40:09 2012 @@ -324,10 +324,10 @@ public class ModelMenu extends ModelWidg public int renderedMenuItemCount(Map<String, Object> context) { - int count = 0; + int count = 0; for (ModelMenuItem item : this.menuItemList) { if (item.shouldBeRendered(context)) - count++; + count++; } return count; } Modified: ofbiz/branches/jackrabbit20100709/ivy.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/ivy.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/ivy.xml (original) +++ ofbiz/branches/jackrabbit20100709/ivy.xml Sat Jan 14 14:40:09 2012 @@ -25,12 +25,12 @@ <description homepage="http://ofbiz.apache.org/"/> </info> <configurations> - <conf name="cobertura" description="downloads cobertura 1.9.3 (GPL2.0) http://cobertura.sourceforge.net/"/> + <conf name="cobertura" description="downloads cobertura 1.9.4.1 (GPL2.0) http://cobertura.sourceforge.net/"/> <conf name="postgres" description="downloads the postgres JDBC driver"/> <conf name="sonar-ant-task" description="downloads the ant sonar task (need sonar>=2.6)"/> </configurations> <dependencies> - <dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.3" conf="cobertura->default"/> + <dependency org="net.sourceforge.cobertura" name="cobertura" rev="1.9.4.1" conf="cobertura->default"/> <dependency org="postgresql" name="postgresql" rev="9.0-801.jdbc4" conf="postgres->default"/> <dependency org="org.codehaus.sonar-plugins" name="sonar-ant-task" rev="1.0" conf="sonar-ant-task->default"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/build.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/build.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/build.xml Sat Jan 14 14:40:09 2012 @@ -1,5 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <project name="OFBiz - scrum Component" default="jar" basedir="."> <import file="../../common.xml"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/config/scrumUiLabels.xml Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <property key="PageTitleAddProductTimeToNewInvoice"> <value xml:lang="en">Add all reported/approved task time to a new invoice</value> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml Sat Jan 14 14:40:09 2012 @@ -23,101 +23,101 @@ xmlns="http://docbook.org/ns/docbook"> <title>Welcome to the SCRUM Component help system</title> <section> - <title>Introduction</title> + <title>Introduction</title> <para> - The purpose of this component is to have a web based and ERP integrated access and recording for all information - related to your Scrum project development. The Scrum development methodology itself is described in any of the following documents: - <orderedlist> + The purpose of this component is to have a web based and ERP integrated access and recording for all information + related to your Scrum project development. The Scrum development methodology itself is described in any of the following documents: + <orderedlist> <listitem><para><link xl:href="http://www.scrum.org/scrumguides/">Scrum guide</link> (various languages)</para></listitem> - <listitem><para><link xl:href="http://www.scrumalliance.org/pages/what_is_scrum">Scrum in 30 seconds.</link></para></listitem> - <listitem><para><link xl:href="http://www.softhouse.se/Uploades/Scrum_eng_webb.pdf">Scrum in 5 minutes</link></para></listitem> - </orderedlist> - </para> - <para> - Below follows a list how the system should be used and at what time you have to update the information within the Scrum component. - </para> - </section> - <section> - <title>Create the available Scrum members</title> - <para> - Any activity in any of the Scrum actions need people who are members of the project. So create the people which will be involved in the "Members Tab". - You need to enter an existing person and company (partyGroup). Persons and companies (PartyGroup) need to be added in the party component first before they can be used in the Scrum component. - </para> - </section> - <section> - <title>Create the product Backlog.</title> - <para> - Before anything can start a product backlog is required which will need a product to be created first. - So create a product assign the it to a product owner which was created in the Scrum member section. - Then go to the backlog and create the backlog items. - </para> - </section> - <section> - <title>Create the project</title> - <para> - Now that we have a project backlog it is time to hold a project meeting. In this project meeting discuss the goals of the project, - the organization and the product backlog items and the estimated hours to complete each item. - </para> - <para> - Now create the project in the system and assign the members to the project with their roles. Attach the minutes of the meeting to the project. - </para> - </section> - <section> - <title>Create the first sprint</title> - <para> - Now that there is a project we can look at creating the (first) sprint. - Have a Sprint meeting, define what should be implemented in the (first) sprint and how it should be implemented - </para> - <para> - Create now the (first) sprint in the system and enter also the number of backlog items which will be included in this sprint. Attach the minutes of the meeting to the project. - </para> - </section> - <section> - <title>Create tasks on the sprint backlog items</title> - <para> - In order to be able to enter actual hours it is required to create at least a single task on every sprint backlog item. - </para> - </section> - <section> - <title>Update daily the actual and planned hours</title> - <para> - Before going to the daily sprint meeting make sure the planned (backlog item) and actuals (tasks) are updated. - </para> - </section> - <section> - <title>Daily sprint meeting</title> - <para> - Have a daily sprint meeting where the three famous questions are answered and enter the answers in the system related to this sprint. - </para> - </section> - <section> - <title>Sprint burndown chart</title> - <para> - Keep an eye on the burndown chart if you are still on track. If not discuss with the product owner if backlog items have to be added or removed. - </para> - </section> - <section> - <title>Sprint Demonstration and Evaluation meeting</title> - <para> - At the end of a sprint demonstrate the system to the product owner and interested parties. The product owner will incorporate comments into the current backlog list. - The team and Scrum master will evaluate the sprint so lessons can be learned for the next sprint. - </para> - <para> - Determine also which tasks were not completed and return them to the product backlog to be included in a next sprint. - </para> - </section> - <para> - The sprint will be repeated until the project is complete. - </para> - <section> - <title>Security</title> - <para> - In the Scrum component there are security roles to access in the Scrum component. - </para> - <para>1. Product Owner can create product, project, and assign member in project.</para> - <para>2. Scrum Master can do anything on the project.</para> - <para>3. Scrum admin can do anything on Scrum component</para> - <para>4. Scrum team can assign task to yourself and view project.</para> - </section> + <listitem><para><link xl:href="http://www.scrumalliance.org/pages/what_is_scrum">Scrum in 30 seconds.</link></para></listitem> + <listitem><para><link xl:href="http://www.softhouse.se/Uploades/Scrum_eng_webb.pdf">Scrum in 5 minutes</link></para></listitem> + </orderedlist> + </para> + <para> + Below follows a list how the system should be used and at what time you have to update the information within the Scrum component. + </para> + </section> + <section> + <title>Create the available Scrum members</title> + <para> + Any activity in any of the Scrum actions need people who are members of the project. So create the people which will be involved in the "Members Tab". + You need to enter an existing person and company (partyGroup). Persons and companies (PartyGroup) need to be added in the party component first before they can be used in the Scrum component. + </para> + </section> + <section> + <title>Create the product Backlog.</title> + <para> + Before anything can start a product backlog is required which will need a product to be created first. + So create a product assign the it to a product owner which was created in the Scrum member section. + Then go to the backlog and create the backlog items. + </para> + </section> + <section> + <title>Create the project</title> + <para> + Now that we have a project backlog it is time to hold a project meeting. In this project meeting discuss the goals of the project, + the organization and the product backlog items and the estimated hours to complete each item. + </para> + <para> + Now create the project in the system and assign the members to the project with their roles. Attach the minutes of the meeting to the project. + </para> + </section> + <section> + <title>Create the first sprint</title> + <para> + Now that there is a project we can look at creating the (first) sprint. + Have a Sprint meeting, define what should be implemented in the (first) sprint and how it should be implemented + </para> + <para> + Create now the (first) sprint in the system and enter also the number of backlog items which will be included in this sprint. Attach the minutes of the meeting to the project. + </para> + </section> + <section> + <title>Create tasks on the sprint backlog items</title> + <para> + In order to be able to enter actual hours it is required to create at least a single task on every sprint backlog item. + </para> + </section> + <section> + <title>Update daily the actual and planned hours</title> + <para> + Before going to the daily sprint meeting make sure the planned (backlog item) and actuals (tasks) are updated. + </para> + </section> + <section> + <title>Daily sprint meeting</title> + <para> + Have a daily sprint meeting where the three famous questions are answered and enter the answers in the system related to this sprint. + </para> + </section> + <section> + <title>Sprint burndown chart</title> + <para> + Keep an eye on the burndown chart if you are still on track. If not discuss with the product owner if backlog items have to be added or removed. + </para> + </section> + <section> + <title>Sprint Demonstration and Evaluation meeting</title> + <para> + At the end of a sprint demonstrate the system to the product owner and interested parties. The product owner will incorporate comments into the current backlog list. + The team and Scrum master will evaluate the sprint so lessons can be learned for the next sprint. + </para> + <para> + Determine also which tasks were not completed and return them to the product backlog to be included in a next sprint. + </para> + </section> + <para> + The sprint will be repeated until the project is complete. + </para> + <section> + <title>Security</title> + <para> + In the Scrum component there are security roles to access in the Scrum component. + </para> + <para>1. Product Owner can create product, project, and assign member in project.</para> + <para>2. Scrum Master can do anything on the project.</para> + <para>3. Scrum admin can do anything on Scrum component</para> + <para>4. Scrum team can assign task to yourself and view project.</para> + </section> </section> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprint.xml Sat Jan 14 14:40:09 2012 @@ -20,13 +20,13 @@ <title>Update Sprint.</title> <para>This use for updating the Sprint.</para> <orderedlist> - <listitem><para>Product Name</para></listitem> - <listitem><para>Sprint Name</para></listitem> - <listitem><para>Sprint Goal</para></listitem> - <listitem><para>Status</para></listitem> - <listitem><para>Start Date</para></listitem> - <listitem><para>End date</para></listitem> - <listitem><para>Planed Hours</para></listitem> - <listitem><para>Sprint Length Weeks</para></listitem> + <listitem><para>Product Name</para></listitem> + <listitem><para>Sprint Name</para></listitem> + <listitem><para>Sprint Goal</para></listitem> + <listitem><para>Status</para></listitem> + <listitem><para>Start Date</para></listitem> + <listitem><para>End date</para></listitem> + <listitem><para>Planed Hours</para></listitem> + <listitem><para>Sprint Length Weeks</para></listitem> </orderedlist> </section> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/helpdata/HELP_SCRUM_EditSprintBacklog.xml Sat Jan 14 14:40:09 2012 @@ -20,7 +20,7 @@ <title>Update Sprint backlog.</title> <para>This part use to update Sprint backlog such as planed hours, ....</para> <orderedlist> - <listitem><para>Enter Planed Hours field (Integer or floating point).</para></listitem> - <listitem><para>Click the update button to update the Sprint Backlog.</para></listitem> + <listitem><para>Enter Planed Hours field (Integer or floating point).</para></listitem> + <listitem><para>Click the update button to update the Sprint Backlog.</para></listitem> </orderedlist> </section> \ No newline at end of file Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/commit.py URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/commit.py?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/commit.py (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/commit.py Sat Jan 14 14:40:09 2012 @@ -1,4 +1,25 @@ #!/usr/bin/python +# +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# + from xml.dom.minidom import Document import httplib,sys,os,subprocess import ConfigParser Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/post-commit URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/post-commit?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/post-commit (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/post-commit Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ #!/bin/sh +##################################################################### +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +##################################################################### # POST-COMMIT HOOK # Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/pre-commit URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/pre-commit?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/pre-commit (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/hookscripts/pre-commit Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ #!/bin/sh +##################################################################### +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +##################################################################### # PRE-COMMIT HOOK # Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumDemoData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumDemoData.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumDemoData.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumDemoData.xml Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <entity-engine-xml> <Party partyId="admin" partyTypeId="PERSON"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumHelpData.xml Sat Jan 14 14:40:09 2012 @@ -23,7 +23,7 @@ objectInfo="specialpurpose/scrum/data/helpdata/HELP_SCRUM.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="SCRUM Help system root" mimeTypeId="text/xml" isPublic="Y" /> <Content contentId="HELP_SCRUM" contentTypeId="DOCUMENT" templateDataResourceId="HELP_TEMPL" - dataResourceId="HELP_SCRUM" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Scrum" mimeTypeId="text/html"/> + dataResourceId="HELP_SCRUM" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="Scrum" mimeTypeId="text/html"/> <ContentAssoc contentId="HELP_ROOT" contentIdTo="HELP_SCRUM" contentAssocTypeId="TREE_CHILD" fromDate="2010-01-01 01:01:01" mapKey="SCRUM_Sprints"/> <!-- === Project === --> <DataResource dataResourceId="HELP_SCRUM_PROJECT" localeString="en" dataResourceTypeId="OFBIZ_FILE" Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumSecurityData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumSecurityData.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumSecurityData.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumSecurityData.xml Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <entity-engine-xml> <!-- Scrum Component --> <SecurityPermission description="View operations in the SCRUM Component." permissionId="SCRUM_VIEW"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/data/scrumTypeData.xml Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <entity-engine-xml> <RoleType roleTypeId="SCRUM_MEMBER" hasTable="N" description="Scrum Member"/> <RoleType roleTypeId="PRODUCT_OWNER" parentTypeId="SCRUM_MEMBER" hasTable="N" description="Product Owner"/> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/entitydef/entitymodel.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/entitydef/entitymodel.xml Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <entitymodel xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/entitymodel.xsd"> <!-- ========================================================= --> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/ofbiz-component.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/ofbiz-component.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/ofbiz-component.xml Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <ofbiz-component name="scrum" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/ofbiz-component.xsd"> @@ -46,5 +64,3 @@ base-permission="" mount-point="/scrumdemo" /> </ofbiz-component> - - Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/permissionServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/permissionServices.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/permissionServices.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/permissionServices.xml Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> <description>scrum Services</description> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/services.xml?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/services.xml (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/servicedef/services.xml Sat Jan 14 14:40:09 2012 @@ -1,4 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd"> <description>scrum Services</description> Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/src/org/ofbiz/scrum/ScrumServices.java Sat Jan 14 14:40:09 2012 @@ -1,3 +1,21 @@ +/******************************************************************************* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + *******************************************************************************/ package org.ofbiz.scrum; import java.io.BufferedReader; Modified: ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl?rev=1231507&r1=1231506&r2=1231507&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl (original) +++ ofbiz/branches/jackrabbit20100709/specialpurpose/scrum/templates/CancelledBacklogNotification.ftl Sat Jan 14 14:40:09 2012 @@ -1,4 +1,21 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> <html xmlns="http://www.w3.org/1999/xhtml"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |