svn commit: r422379 [1/2] - in /incubator/ofbiz/trunk/applica
Locked
svn commit: r422379 [1/2] - in /incubator/ofbiz/trunk/applica
 
|
Author: jacopoc
Date: Sat Jul 15 22:50:40 2006 New Revision: 422379 URL: http://svn.apache.org/viewvc?rev=422379&view=rev Log: Conversion from MIT to ASL2.0 for all the files of the marketing component. Many thanks to Ashish Vijaywargiya for the patch (Apache OFBIZ-87). Modified: incubator/ofbiz/trunk/applications/marketing/build.xml incubator/ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml incubator/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml incubator/ofbiz/trunk/applications/marketing/entitydef/entitygroup.xml incubator/ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml incubator/ofbiz/trunk/applications/marketing/ofbiz-component.xml incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml incubator/ofbiz/trunk/applications/marketing/servicedef/secas.xml incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListTabBar.ftl incubator/ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceTabBar.ftl incubator/ofbiz/trunk/applications/marketing/webapp/marketing/error/error.jsp incubator/ofbiz/trunk/applications/marketing/webapp/marketing/error/error403.jsp incubator/ofbiz/trunk/applications/marketing/webapp/marketing/error/error404.jsp incubator/ofbiz/trunk/applications/marketing/webapp/marketing/includes/appbar.ftl incubator/ofbiz/trunk/applications/marketing/webapp/marketing/includes/countries.ftl incubator/ofbiz/trunk/applications/marketing/webapp/marketing/includes/errormsg.ftl incubator/ofbiz/trunk/applications/marketing/webapp/marketing/includes/states.ftl incubator/ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentTabBar.ftl incubator/ofbiz/trunk/applications/marketing/webapp/marketing/templates/main.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/templates/plain.ftl incubator/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml incubator/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml incubator/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml incubator/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml incubator/ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml incubator/ofbiz/trunk/applications/marketing/widget/LookupScreens.xml incubator/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml incubator/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml incubator/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml incubator/ofbiz/trunk/applications/marketing/widget/ReportForms.xml incubator/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml incubator/ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Modified: incubator/ofbiz/trunk/applications/marketing/build.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/build.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/build.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/build.xml Sat Jul 15 22:50:40 2006 @@ -1,27 +1,19 @@ <?xml version="1.0"?> <!-- - * Copyright (c) 2001 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * This is the Open for Business Service Build Script. - * $Id: build.xml 7900 2006-06-29 05:03:20Z jonesde $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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 - Marketing Component" default="jar" basedir="."> Modified: incubator/ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/data/MarketingSecurityData.xml Sat Jul 15 22:50:40 2006 @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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> <!-- Marketing Manager security --> <SecurityPermission description="View operations in the Marketing Manager." permissionId="MARKETING_VIEW"/> Modified: incubator/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/data/MarketingTypeData.xml Sat Jul 15 22:50:40 2006 @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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> <ContactListType contactListTypeId="MARKETING" description="Marketing"/> <ContactListType contactListTypeId="NEWSLETTER" description="Newsletter"/> Modified: incubator/ofbiz/trunk/applications/marketing/entitydef/entitygroup.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/entitydef/entitygroup.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/entitydef/entitygroup.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/entitydef/entitygroup.xml Sat Jul 15 22:50:40 2006 @@ -1,24 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. --> <entitygroup xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Modified: incubator/ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/entitydef/entitymodel.xml Sat Jul 15 22:50:40 2006 @@ -1,28 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * @author David E. Jones ([hidden email]) - * @author Andy Zeneski ([hidden email]) - * @version $Rev$ +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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" Modified: incubator/ofbiz/trunk/applications/marketing/ofbiz-component.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/ofbiz-component.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/ofbiz-component.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/ofbiz-component.xml Sat Jul 15 22:50:40 2006 @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * $Id: ofbiz-component.xml 5710 2005-09-12 15:52:27Z jonesde $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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="marketing" Modified: incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml Sat Jul 15 22:50:40 2006 @@ -1,28 +1,20 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * @author <a href="mailto:[hidden email]">David E. Jones</a> - * @version 1.0 - * Created on October 19, 2002 - --> + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. +--> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd"> Modified: incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Sat Jul 15 22:50:40 2006 @@ -1,28 +1,20 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * @author <a href="mailto:[hidden email]">David E. Jones</a> - * @version 1.0 - * Created on October 19, 2002 - --> + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. +--> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd"> Modified: incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Sat Jul 15 22:50:40 2006 @@ -1,25 +1,20 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- - * Copyright (c) 2001-2005 The Open For Business Project and repected authors. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --> + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. +--> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd"> Modified: incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Sat Jul 15 22:50:40 2006 @@ -1,29 +1,20 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * @author <a href="mailto:[hidden email]">David E. Jones</a> - * @version 1.0 - * Created on October 19, 2002 - --> + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. +--> <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/simple-methods.xsd"> Modified: incubator/ofbiz/trunk/applications/marketing/servicedef/secas.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/servicedef/secas.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/servicedef/secas.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/servicedef/secas.xml Sat Jul 15 22:50:40 2006 @@ -1,24 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2005-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. --> <service-eca xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Modified: incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/servicedef/services.xml Sat Jul 15 22:50:40 2006 @@ -1,24 +1,19 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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" Modified: incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java (original) +++ incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/report/ReportHelper.java Sat Jul 15 22:50:40 2006 @@ -1,25 +1,18 @@ /* - * $Id: ReportHelper.java 6395 2005-12-21 21:35:48 mujinsong $ * - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed 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.marketing.report; Modified: incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java (original) +++ incubator/ofbiz/trunk/applications/marketing/src/org/ofbiz/marketing/tracking/TrackingCodeEvents.java Sat Jul 15 22:50:40 2006 @@ -1,25 +1,18 @@ /* - * $Id: TrackingCodeEvents.java 5462 2005-08-05 18:35:48Z jonesde $ * - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed 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.marketing.tracking; Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/MarketingCampaignReport.bsh Sat Jul 15 22:50:40 2006 @@ -1,27 +1,18 @@ /* - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * @author <a href="mailto:[hidden email]">Mu Jinsong</a> - * @version $Rev: 6395 - * @since 3.2 + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed 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. */ import org.ofbiz.entity.GenericValue; @@ -65,4 +56,4 @@ //use this helper to build a List of visits, orders, order totals, and conversion rates marketingCampaignVisitAndOrders = ReportHelper.calcConversionRates(visits, orders, "marketingCampaignId"); -context.put("marketingCampaignVisitAndOrders", marketingCampaignVisitAndOrders); \ No newline at end of file +context.put("marketingCampaignVisitAndOrders", marketingCampaignVisitAndOrders); Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh Sat Jul 15 22:50:40 2006 @@ -1,27 +1,18 @@ /* - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * @author <a href="mailto:[hidden email]">Mu Jinsong</a> - * @version $Rev: 6395 - * @since 3.2 + * Copyright 2001-2006 The Apache Software Foundation + * + * Licensed 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. */ import org.ofbiz.entity.GenericValue; Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/controller.xml Sat Jul 15 22:50:40 2006 @@ -1,24 +1,19 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- - * Copyright (c) 2001-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORToLR7ZL-752556-515361-190105000 - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. --> <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml Sat Jul 15 22:50:40 2006 @@ -1,26 +1,21 @@ <?xml version="1.0"?> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd"> -<!-- - * Copyright (c) 2001 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. +<!-- + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. --> <web-app> Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Sat Jul 15 22:50:40 2006 @@ -1,24 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. --> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -130,4 +125,4 @@ <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"><hyperlink target="${donePage}?marketingCampaignId=${marketingCampaignId}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml Sat Jul 15 22:50:40 2006 @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2004-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * $Id: MarketingCampaignMenus.xml,v 1.1 2005/10/11 20:57:13 titanouk Exp $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd"> Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignTabBar.ftl Sat Jul 15 22:50:40 2006 @@ -1,25 +1,18 @@ <#-- - * Copyright (c) 2002-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. --> <#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Sat Jul 15 22:50:40 2006 @@ -1,24 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. --> <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml Sat Jul 15 22:50:40 2006 @@ -1,26 +1,19 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - * Copyright (c) 2004-2005 The Open For Business Project - www.ofbiz.org - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT - * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR - * THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * $Id: ProductScreens.xml 4990 2005-05-14 10:00:28Z jacopo $ + +Copyright 2001-2006 The Apache Software Foundation + +Licensed 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. --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.ofbiz.org/dtds/widget-menu.xsd"> Modified: incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListTabBar.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListTabBar.ftl?rev=422379&r1=422378&r2=422379&view=diff ============================================================================== --- incubator/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListTabBar.ftl (original) +++ incubator/ofbiz/trunk/applications/marketing/webapp/mar |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |