updates for SOPE:X 2.x

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@440 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sopex/Templates/ChangeLog b/sopex/Templates/ChangeLog
index 261e12cb3174c208705033355b12d4e5158de0f2..873bd6555e0d3949bd83bd070d30aa0c94113985 100644 (file)
--- a/sopex/Templates/ChangeLog
+++ b/sopex/Templates/ChangeLog
@@ -1,3 +1,7 @@
+2004-12-14  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+       * Project Templates/SOPE/Web Application/*: updated for SOPE:X 2.x.
+
 2004-08-18  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * README: fixed location 1), reported by

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Application.h b/sopex/Templates/Project Templates/SOPE/Web Application/Application.h
index e603d5c7a12ddd49063b295837ba242f2b42ce67..226ed9f152b1314dfd9f8ba2f796da933e8940a1 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/Application.h
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/Application.h
@@ -5,8 +5,8 @@
 // Created by ÇUSERNAMEÈ on ÇDATEÈ
 //
 
-#ifndef        __Application_H_
-#define        __Application_H_
+#ifndef        __ÇPROJECTNAMEÈ_Application_H_
+#define        __ÇPROJECTNAMEÈ_Application_H_
 
 #include <NGObjWeb/NGObjWeb.h>
 
@@ -18,4 +18,4 @@
 
 @end
 
-#endif /* __Application_H_ */
+#endif /* __ÇPROJECTNAMEÈ_Application_H_ */

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/DirectAction.h b/sopex/Templates/Project Templates/SOPE/Web Application/DirectAction.h
index 16fc4321af6f81b415e351d83c78f71be52c3e35..405c31f61eb25ae606649d6448859cbd0871b959 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/DirectAction.h
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/DirectAction.h
@@ -5,8 +5,8 @@
 // Created by ÇUSERNAMEÈ on ÇDATEÈ
 //
 
-#ifndef        __DirectAction_H_
-#define        __DirectAction_H_
+#ifndef        __ÇPROJECTNAMEÈ_DirectAction_H_
+#define        __ÇPROJECTNAMEÈ_DirectAction_H_
 
 #include <NGObjWeb/NGObjWeb.h>
 
@@ -18,4 +18,4 @@
 
 @end
 
-#endif /* __DirectAction_H_ */
+#endif /* __ÇPROJECTNAMEÈ_DirectAction_H_ */

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/English.lproj/InfoPlist.strings b/sopex/Templates/Project Templates/SOPE/Web Application/English.lproj/InfoPlist.strings
index e612457676d964a8021d20ec90290d5c6c3d88c1..2f8003a4a5798d18622c47c5685d0e7dae533e53 100644 (file)
Binary files a/sopex/Templates/Project Templates/SOPE/Web Application/English.lproj/InfoPlist.strings and b/sopex/Templates/Project Templates/SOPE/Web Application/English.lproj/InfoPlist.strings differ

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile
index 5f05e6bc9a45a75fb041bb59e62675f50543464e..b6aae045321217369f7e4cf1c4cb819af70f729e 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile
@@ -1,25 +1,24 @@
 #
 #  GNUmakefile
-#  ÇPROJECTNAMEÈ
+#  «PROJECTNAME»
 #
-#  Created by ÇFULLUSERNAMEÈ on ÇDATEÈ.
-#  Copyright (c) ÇYEARÈ ÇORGANIZATIONNAMEÈ. All rights reserved.
+#  Created by «FULLUSERNAME» on «DATE».
+#  Copyright (c) «YEAR» «ORGANIZATIONNAME». All rights reserved.
 #
 
 include $(GNUSTEP_MAKEFILES)/common.make
 
-WOAPP_NAME = ÇPROJECTNAMEÈ
+WOAPP_NAME = «PROJECTNAME»
 
-ÇPROJECTNAMEÈ_OBJC_FILES = \
-ÇPROJECTNAMEÈ_main.m   Application.m   Session.m       DirectAction.m  \
+«PROJECTNAME»_OBJC_FILES = \
+«PROJECTNAME»_main.m Application.m   Session.m       DirectAction.m  \
 Main.m
 
-ÇPROJECTNAMEÈ_COMPONENTS = \
-Main.wo
+«PROJECTNAME»_COMPONENTS = \
 
-ÇPROJECTNAMEÈ_RESOURCE_FILES = \
+«PROJECTNAME»_RESOURCE_FILES = \
 
-ÇPROJECTNAMEÈ_WEBSERVER_RESOURCE_FILES := $(shell find WebServerResources -type f -print)
+«PROJECTNAME»_WEBSERVER_RESOURCE_FILES := $(shell find WebServerResources -type f -print)
 
 -include GNUmakefile.preamble
 include $(GNUSTEP_MAKEFILES)/woapp.make

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.postamble b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.postamble
index 374cb0f45d3b8a75093bb7f6ed150c6c18a8b5f8..7aab0b0c18960905e9b378b8f117bd63212be113 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.postamble
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.postamble
@@ -1,15 +1,13 @@
 #
 #  GNUmakefile.postamble
-#  ÇPROJECTNAMEÈ
+#  «PROJECTNAME»
 #
-#  Created by ÇFULLUSERNAMEÈ on ÇDATEÈ.
-#  Copyright (c) ÇYEARÈ ÇORGANIZATIONNAMEÈ. All rights reserved.
+#  Created by «FULLUSERNAME» on «DATE».
+#  Copyright (c) «YEAR» «ORGANIZATIONNAME». All rights reserved.
 #
 
-
 -include GNUmakefile.postamble.local
 
-
 # Add support for apple-generic versioning if
 # $(NAME)_CURRENT_PROJECT_VERSION is set
 

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.preamble b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.preamble
index fef2a2994dd333344dd3d25e6278e7411984b60a..e75171395af39c8d49d36dfde4effef262dfa166 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.preamble
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/GNUmakefile.preamble
@@ -1,23 +1,19 @@
 #
 #  GNUmakefile.preamble
-#  ÇPROJECTNAMEÈ
+#  «PROJECTNAME»
 #
-#  Created by ÇFULLUSERNAMEÈ on ÇDATEÈ.
-#  Copyright (c) ÇYEARÈ ÇORGANIZATIONNAMEÈ. All rights reserved.
+#  Created by «FULLUSERNAME» on «DATE».
+#  Copyright (c) «YEAR» «ORGANIZATIONNAME». All rights reserved.
 #
 
-
 -include GNUmakefile.preamble.local
 
-
 NAME = $(WOAPP_NAME)
 
-
 ifeq ($(findstring darwin, $(GNUSTEP_HOST_OS)),)
 ADDITIONAL_OBJCFLAGS += -DWITHOUT_SOPEX
 endif
 
-
 # Add support for apple-generic versioning if
 # $(NAME)_CURRENT_PROJECT_VERSION is set
 

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Info.plist b/sopex/Templates/Project Templates/SOPE/Web Application/Info.plist
index 39a9b1bf78c2fad5a87ff657b888fe7b7b97ec78..413152304bd61f3b8e22565900e9c57b8d00e018 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/Info.plist
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/Info.plist
@@ -17,7 +17,7 @@
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>0.1</string>
+       <string>1.0</string>
        <key>NSMainNibFile</key>
        <string></string>
        <key>NSPrincipalClass</key>

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Main.h b/sopex/Templates/Project Templates/SOPE/Web Application/Main.h
deleted file mode 100644 (file)
index e0653ea..0000000
--- a/sopex/Templates/Project Templates/SOPE/Web Application/Main.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Main.h: Header file for Web Component 'Main'
-// Project ÇPROJECTNAMEÈ
-//
-// Created by ÇUSERNAMEÈ on ÇDATEÈ
-//
-
-#ifndef        __Main_H_
-#define        __Main_H_
-
-#include <NGObjWeb/NGObjWeb.h>
-
-
-@interface Main : WOComponent
-{
-
-}
-
-@end
-
-#endif /* __Main_H_ */

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Main.m b/sopex/Templates/Project Templates/SOPE/Web Application/Main.m
index 1867541ffd1f263647a155a6f0efe08f352dd0a1..60e472721831dddae55537524524415c1e048a29 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/Main.m
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/Main.m
@@ -1,12 +1,35 @@
-//
-// Main.m: Implementation file for Web Component 'Main'
-// Project ÇPROJECTNAMEÈ
-//
-// Created by ÇUSERNAMEÈ on ÇDATEÈ
-//
+/*
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
+  This file is part of OGo
 
-#include "Main.h"
+  OGo is free software; you can redistribute it and/or modify it under
+  the terms of the GNU Lesser General Public License as published by the
+  Free Software Foundation; either version 2, or (at your option) any
+  later version.
+
+  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
+  WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+  License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with OGo; see the file COPYING.  If not, write to the
+  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+  02111-1307, USA.
+*/
+// $Id: wox.m 25 2004-07-30 11:22:02Z znek $
+
+
+#include <NGObjWeb/NGObjWeb.h>
+
+
+@interface Main : WOComponent
+{
+
+}
+
+@end
 
 
 @implementation Main

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Main.wo/Main.html b/sopex/Templates/Project Templates/SOPE/Web Application/Main.wo/Main.html
deleted file mode 100644 (file)
index cd07cc7..0000000
--- a/sopex/Templates/Project Templates/SOPE/Web Application/Main.wo/Main.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-  <head>
-    <title><#ComponentName /></title>
-  </head>
-  <body>
-  The template of Web Component <em><#ComponentName /></em> has not been edited, yet.
-  </body>
-</html>

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Main.wo/Main.wod b/sopex/Templates/Project Templates/SOPE/Web Application/Main.wo/Main.wod
deleted file mode 100644 (file)
index 0dc4d2c..0000000
--- a/sopex/Templates/Project Templates/SOPE/Web Application/Main.wo/Main.wod
+++ /dev/null
@@ -1,3 +0,0 @@
-ComponentName: WOString {
-  value = name;
-}

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Main.wox b/sopex/Templates/Project Templates/SOPE/Web Application/Main.wox
new file mode 100644 (file)
index 0000000..48ca008
--- /dev/null
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/Main.wox
@@ -0,0 +1,15 @@
+<?xml version='1.0' standalone='yes'?>
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:var="http://www.skyrix.com/od/binding"
+      xmlns:const="http://www.skyrix.com/od/constant"
+      xmlns:rsrc="OGo:url"
+>
+  <head>
+    <title><var:string value="name"/></title>
+  </head>
+
+  <body>
+  The template of Web Component <em><var:string value="name"/></em> has not been edited, yet.
+  </body>
+</html>
\ No newline at end of file

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/Session.h b/sopex/Templates/Project Templates/SOPE/Web Application/Session.h
index e1d085437308bf15799d8f532df2db0176d8d3df..62f82a11adfcbab7708e1d4b57f634820d7ee1ef 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/Session.h
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/Session.h
@@ -5,8 +5,8 @@
 // Created by ÇUSERNAMEÈ on ÇDATEÈ
 //
 
-#ifndef        __Session_H_
-#define        __Session_H_
+#ifndef        __ÇPROJECTNAMEÈ_Session_H_
+#define        __ÇPROJECTNAMEÈ_Session_H_
 
 #include <NGObjWeb/NGObjWeb.h>
 
@@ -18,4 +18,4 @@
 
 @end
 
-#endif /* __Session_H_ */
+#endif /* __ÇPROJECTNAMEÈ_Session_H_ */

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/project.pbxproj b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/project.pbxproj
index 87fb4da2755f928b0042fe7b423b0692e882c47a..8203fcf0241bf78f727829ba0e6986100ac43ea3 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/project.pbxproj
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp.xcode/project.pbxproj
@@ -7,11 +7,9 @@
        objects = {
                080E96DDFE201D6D7F000001 = {
                        children = (
-                               AD19ED5205D7FBD1009EBA3A,
+                               ADAD4713076F443B00AAD24E,
                                AD19ED5305D7FBD1009EBA3A,
-                               AD19ED6305D7FBEA009EBA3A,
                                AD19ED6405D7FBEA009EBA3A,
-                               ADEE3DD505DD126900F523DB,
                                ADEE3DD605DD126900F523DB,
                        );
                        isa = PBXGroup;
@@ -42,25 +40,6 @@
 //082
 //083
 //084
-//100
-//101
-//102
-//103
-//104
-               1058C7A1FEA54F0111CA2CBB = {
-                       fallbackIsa = PBXFileReference;
-                       isa = PBXFrameworkReference;
-                       lastKnownFileType = wrapper.framework;
-                       name = Foundation.framework;
-                       path = /System/Library/Frameworks/Foundation.framework;
-                       refType = 0;
-                       sourceTree = "<absolute>";
-               };
-//100
-//101
-//102
-//103
-//104
 //190
 //191
 //192
@@ -111,6 +90,7 @@
                                AD95AEBB0664BC7B00FCB211,
                                AD95AEB90664BC6700FCB211,
                                AD0ACCDE062732BD0054A820,
+                               ADAD4771076F458B00AAD24E,
                                080E96DDFE201D6D7F000001,
                                AD19ED3F05D7FBB4009EBA3A,
                                29B97315FDCFA39411CA2CEA,
@@ -127,7 +107,6 @@
                };
                29B97315FDCFA39411CA2CEA = {
                        children = (
-                               32CA4F630368D1EE00C91783,
                                29B97316FDCFA39411CA2CEA,
                        );
                        isa = PBXGroup;
@@ -158,9 +137,12 @@
                };
                29B97323FDCFA39411CA2CEA = {
                        children = (
-                               1058C7A1FEA54F0111CA2CBB,
                                ADEE3DEB05DD135A00F523DB,
-                               AD19ED3105D7FAF4009EBA3A,
+                               ADAD47B0076F45FB00AAD24E,
+                               ADAD48FF076F460A00AAD24E,
+                               ADAD4902076F461500AAD24E,
+                               ADAD4905076F461900AAD24E,
+                               ADAD4908076F461F00AAD24E,
                                ADEE3DDB05DD131E00F523DB,
                        );
                        isa = PBXGroup;
@@ -174,35 +156,16 @@
 //292
 //293
 //294
-//320
-//321
-//322
-//323
-//324
-               32CA4F630368D1EE00C91783 = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = "«PROJECTNAME»_Prefix.pch";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-//320
-//321
-//322
-//323
-//324
 //4A0
 //4A1
 //4A2
 //4A3
 //4A4
                4A9504CCFFE6A4B311CA0CBA = {
-                       buildRules = (
-                       );
                        buildSettings = {
                                COPY_PHASE_STRIP = NO;
                                DEBUGGING_SYMBOLS = YES;
+                               FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
                                GCC_DYNAMIC_NO_PIC = NO;
                                GCC_ENABLE_FIX_AND_CONTINUE = YES;
                                GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
@@ -214,11 +177,18 @@
                        name = Development;
                };
                4A9504CDFFE6A4B311CA0CBA = {
-                       buildRules = (
-                       );
                        buildSettings = {
                                COPY_PHASE_STRIP = YES;
+                               DEBUGGING_SYMBOLS = NO;
+                               DEPLOYMENT_LOCATION = YES;
+                               DEPLOYMENT_POSTPROCESSING = YES;
+                               DSTROOT = /;
+                               FRAMEWORK_SEARCH_PATHS = "$(USER_LIBRARY_DIR)/EmbeddedFrameworks";
                                GCC_ENABLE_FIX_AND_CONTINUE = NO;
+                               INSTALL_MODE_FLAG = "go-w,a+rX,u+w";
+                               OPTIMIZATION_CFLAGS = "-O3";
+                               SYMROOT = /tmp/SOPEXDeploymentProducts;
+                               TEMP_DIR = "$(SYMROOT)/$(PROJECT_NAME).build/$(TARGET_NAME).build";
                                ZERO_LINK = NO;
                        };
                        isa = PBXBuildStyle;
@@ -241,27 +211,17 @@
                                8D11072C0486CEB800E47090,
                                8D11072E0486CEB800E47090,
                                ADF026F205D903AE00D2292D,
+                               ADAD4A7C076F48FF00AAD24E,
                        );
                        buildRules = (
                        );
                        buildSettings = {
-                               FRAMEWORK_SEARCH_PATHS = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-                               GCC_ENABLE_TRIGRAPHS = NO;
-                               GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
                                GCC_PRECOMPILE_PREFIX_HEADER = YES;
-                               GCC_PREFIX_HEADER = "«PROJECTNAME»_Prefix.pch";
-                               GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO;
-                               GCC_WARN_FOUR_CHARACTER_CONSTANTS = NO;
-                               GCC_WARN_UNKNOWN_PRAGMAS = NO;
-                               HEADER_SEARCH_PATHS = "";
+                               GCC_PREFIX_HEADER = common.h;
                                INFOPLIST_FILE = Info.plist;
                                INSTALL_PATH = "$(HOME)/Applications";
-                               LIBRARY_SEARCH_PATHS = "";
-                               OTHER_CFLAGS = "";
-                               OTHER_LDFLAGS = "";
+                               OTHER_CFLAGS = "-DNeXT_RUNTIME=1 -DAPPLE_RUNTIME=1 -DNeXT_Foundation_LIBRARY=1 -DCOCOA_Foundation_LIBRARY=1";
                                PRODUCT_NAME = "«PROJECTNAME»";
-                               SECTORDER_FLAGS = "";
-                               WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
                                WRAPPER_EXTENSION = sopex;
                        };
                        dependencies = (
@@ -276,33 +236,29 @@
                8D1107270486CEB800E47090 = {
                        buildActionMask = 2147483647;
                        files = (
-                               8D1107280486CEB800E47090,
-                               AD19ED3B05D7FB8F009EBA3A,
                                AD19ED5405D7FBD1009EBA3A,
                                AD19ED6505D7FBEA009EBA3A,
                                ADEE3DD705DD126900F523DB,
+                               ADAD4714076F443B00AAD24E,
                        );
                        isa = PBXHeadersBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
                };
-               8D1107280486CEB800E47090 = {
-                       fileRef = 32CA4F630368D1EE00C91783;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
                8D1107290486CEB800E47090 = {
                        buildActionMask = 2147483647;
                        files = (
                                8D11072B0486CEB800E47090,
-                               AD19ED3A05D7FB8F009EBA3A,
                                ADEE3DD005DD11C900F523DB,
                                ADA38B8205DD238A00C820AA,
-                               AD0ACCE2062733380054A820,
-                               AD0ACCE3062733380054A820,
-                               AD0ACCE4062733380054A820,
                                AD95AEBA0664BC6700FCB211,
                                AD95AEBC0664BC7B00FCB211,
+                               ADAD4711076F441600AAD24E,
+                               ADAD4A74076F48D000AAD24E,
+                               ADAD4A75076F48D300AAD24E,
+                               ADAD4A76076F48D500AAD24E,
+                               ADAD4A77076F48D800AAD24E,
+                               ADAD4A78076F48DB00AAD24E,
+                               ADAD4A79076F48DD00AAD24E,
                        );
                        isa = PBXResourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
@@ -317,10 +273,10 @@
                        buildActionMask = 2147483647;
                        files = (
                                8D11072D0486CEB800E47090,
-                               AD19ED3C05D7FB8F009EBA3A,
                                AD19ED5505D7FBD1009EBA3A,
                                AD19ED6605D7FBEA009EBA3A,
                                ADEE3DD805DD126900F523DB,
+                               ADAD4712076F441600AAD24E,
                        );
                        isa = PBXSourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
@@ -338,6 +294,21 @@
                        files = (
                                ADEE3DEC05DD135A00F523DB,
                                ADEE3DDC05DD131F00F523DB,
+                               ADAD47B1076F45FB00AAD24E,
+                               ADAD490C076F465E00AAD24E,
+                               ADAD490D076F465E00AAD24E,
+                               ADAD490E076F465E00AAD24E,
+                               ADAD492C076F468900AAD24E,
+                               ADAD492D076F468900AAD24E,
+                               ADAD4938076F46B200AAD24E,
+                               ADAD4939076F46B200AAD24E,
+                               ADAD493A076F46B200AAD24E,
+                               ADAD493B076F46B200AAD24E,
+                               ADAD493C076F46B200AAD24E,
+                               ADAD493D076F46B200AAD24E,
+                               ADAD494D076F46D000AAD24E,
+                               ADAD494E076F46D000AAD24E,
+                               ADAD494F076F46D000AAD24E,
                        );
                        isa = PBXFrameworksBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
@@ -381,111 +352,37 @@
                };
                AD0ACCDF062733370054A820 = {
                        explicitFileType = sourcecode.make;
-                       fileEncoding = 30;
+                       fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                AD0ACCE0062733370054A820 = {
                        explicitFileType = sourcecode.make;
-                       fileEncoding = 30;
+                       fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
                        path = GNUmakefile.postamble;
                        refType = 4;
                        sourceTree = "<group>";
+                       tabWidth = 8;
                };
                AD0ACCE1062733370054A820 = {
                        explicitFileType = sourcecode.make;
-                       fileEncoding = 30;
-                       isa = PBXFileReference;
-                       path = GNUmakefile.preamble;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD0ACCE2062733380054A820 = {
-                       fileRef = AD0ACCDF062733370054A820;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
-               AD0ACCE3062733380054A820 = {
-                       fileRef = AD0ACCE0062733370054A820;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
-               AD0ACCE4062733380054A820 = {
-                       fileRef = AD0ACCE1062733370054A820;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
-               AD19ED3105D7FAF4009EBA3A = {
-                       isa = PBXFileReference;
-                       lastKnownFileType = wrapper.framework;
-                       name = SOPE.framework;
-                       path = /Library/Frameworks/SOPE.framework;
-                       refType = 0;
-                       sourceTree = "<absolute>";
-               };
-               AD19ED3305D7FB8F009EBA3A = {
-                       children = (
-                               AD19ED3405D7FB8F009EBA3A,
-                               AD19ED3805D7FB8F009EBA3A,
-                               AD19ED3905D7FB8F009EBA3A,
-                       );
-                       isa = PBXGroup;
-                       name = Main;
-                       path = "";
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD19ED3405D7FB8F009EBA3A = {
-                       includeInIndex = 0;
-                       isa = PBXFileReference;
-                       lastKnownFileType = folder;
-                       path = Main.wo;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD19ED3805D7FB8F009EBA3A = {
-                       fileEncoding = 4;
-                       isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.h;
-                       path = Main.h;
-                       refType = 4;
-                       sourceTree = "<group>";
-               };
-               AD19ED3905D7FB8F009EBA3A = {
                        fileEncoding = 4;
+                       indentWidth = 8;
                        isa = PBXFileReference;
-                       lastKnownFileType = sourcecode.c.objc;
-                       path = Main.m;
+                       path = GNUmakefile.preamble;
                        refType = 4;
                        sourceTree = "<group>";
-               };
-               AD19ED3A05D7FB8F009EBA3A = {
-                       fileRef = AD19ED3405D7FB8F009EBA3A;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
-               AD19ED3B05D7FB8F009EBA3A = {
-                       fileRef = AD19ED3805D7FB8F009EBA3A;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
-               };
-               AD19ED3C05D7FB8F009EBA3A = {
-                       fileRef = AD19ED3905D7FB8F009EBA3A;
-                       isa = PBXBuildFile;
-                       settings = {
-                       };
+                       tabWidth = 8;
                };
                AD19ED3F05D7FBB4009EBA3A = {
                        children = (
-                               AD19ED3305D7FB8F009EBA3A,
+                               ADAD470E076F441600AAD24E,
                        );
                        isa = PBXGroup;
                        name = "Web Components";
@@ -638,6 +535,476 @@
                        refType = 4;
                        sourceTree = "<group>";
                };
+               ADAD470E076F441600AAD24E = {
+                       children = (
+                               ADAD470F076F441600AAD24E,
+                               ADAD4710076F441600AAD24E,
+                       );
+                       isa = PBXGroup;
+                       name = Main;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADAD470F076F441600AAD24E = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = text.xml;
+                       path = Main.wox;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADAD4710076F441600AAD24E = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.objc;
+                       path = Main.m;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADAD4711076F441600AAD24E = {
+                       fileRef = ADAD470F076F441600AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4712076F441600AAD24E = {
+                       fileRef = ADAD4710076F441600AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4713076F443B00AAD24E = {
+                       fileEncoding = 4;
+                       isa = PBXFileReference;
+                       lastKnownFileType = sourcecode.c.h;
+                       path = common.h;
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADAD4714076F443B00AAD24E = {
+                       fileRef = ADAD4713076F443B00AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4771076F458B00AAD24E = {
+                       children = (
+                               AD19ED5205D7FBD1009EBA3A,
+                               AD19ED6305D7FBEA009EBA3A,
+                               ADEE3DD505DD126900F523DB,
+                       );
+                       isa = PBXGroup;
+                       name = Headers;
+                       path = "";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADAD47B0076F45FB00AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = WebKit.framework;
+                       path = /System/Library/Frameworks/WebKit.framework;
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD47B1076F45FB00AAD24E = {
+                       fileRef = ADAD47B0076F45FB00AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD48FF076F460A00AAD24E = {
+                       children = (
+                               ADAD490A076F465E00AAD24E,
+                               ADAD4909076F465E00AAD24E,
+                               ADAD490B076F465E00AAD24E,
+                       );
+                       isa = PBXGroup;
+                       name = "sope-xml";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADAD4902076F461500AAD24E = {
+                       children = (
+                               ADAD492A076F468900AAD24E,
+                               ADAD492B076F468900AAD24E,
+                       );
+                       isa = PBXGroup;
+                       name = "sope-core";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADAD4905076F461900AAD24E = {
+                       children = (
+                               ADAD4932076F46B200AAD24E,
+                               ADAD4933076F46B200AAD24E,
+                               ADAD4934076F46B200AAD24E,
+                               ADAD4935076F46B200AAD24E,
+                               ADAD4936076F46B200AAD24E,
+                               ADAD4937076F46B200AAD24E,
+                       );
+                       isa = PBXGroup;
+                       name = "sope-appserver";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADAD4908076F461F00AAD24E = {
+                       children = (
+                               ADAD494A076F46D000AAD24E,
+                               ADAD494B076F46D000AAD24E,
+                               ADAD494C076F46D000AAD24E,
+                       );
+                       isa = PBXGroup;
+                       name = "sope-mime";
+                       refType = 4;
+                       sourceTree = "<group>";
+               };
+               ADAD4909076F465E00AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = DOM.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/DOM.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD490A076F465E00AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = SaxObjC.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/SaxObjC.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD490B076F465E00AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = XmlRpc.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/XmlRpc.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD490C076F465E00AAD24E = {
+                       fileRef = ADAD4909076F465E00AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD490D076F465E00AAD24E = {
+                       fileRef = ADAD490A076F465E00AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD490E076F465E00AAD24E = {
+                       fileRef = ADAD490B076F465E00AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD492A076F468900AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = EOControl.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/EOControl.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD492B076F468900AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = NGExtensions.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/NGExtensions.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD492C076F468900AAD24E = {
+                       fileRef = ADAD492A076F468900AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD492D076F468900AAD24E = {
+                       fileRef = ADAD492B076F468900AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4932076F46B200AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = NGHttp.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/NGHttp.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD4933076F46B200AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = NGObjWeb.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/NGObjWeb.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD4934076F46B200AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = NGStreams.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/NGStreams.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD4935076F46B200AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = NGXmlRpc.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/NGXmlRpc.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD4936076F46B200AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = SoObjects.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/SoObjects.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD4937076F46B200AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = WebDAV.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/WebDAV.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD4938076F46B200AAD24E = {
+                       fileRef = ADAD4932076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4939076F46B200AAD24E = {
+                       fileRef = ADAD4933076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD493A076F46B200AAD24E = {
+                       fileRef = ADAD4934076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD493B076F46B200AAD24E = {
+                       fileRef = ADAD4935076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD493C076F46B200AAD24E = {
+                       fileRef = ADAD4936076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD493D076F46B200AAD24E = {
+                       fileRef = ADAD4937076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD494A076F46D000AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = NGImap4.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/NGImap4.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD494B076F46D000AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = NGMail.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/NGMail.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD494C076F46D000AAD24E = {
+                       isa = PBXFileReference;
+                       lastKnownFileType = wrapper.framework;
+                       name = NGMime.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/NGMime.framework";
+                       refType = 0;
+                       sourceTree = "<absolute>";
+               };
+               ADAD494D076F46D000AAD24E = {
+                       fileRef = ADAD494A076F46D000AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD494E076F46D000AAD24E = {
+                       fileRef = ADAD494B076F46D000AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD494F076F46D000AAD24E = {
+                       fileRef = ADAD494C076F46D000AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A74076F48D000AAD24E = {
+                       fileRef = ADA38BE605DD23C400C820AA;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A75076F48D300AAD24E = {
+                       fileRef = AD95C1890664C1E400FCB211;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A76076F48D500AAD24E = {
+                       fileRef = AD95C18B0664C1E400FCB211;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A77076F48D800AAD24E = {
+                       fileRef = AD95C1870664C1E400FCB211;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A78076F48DB00AAD24E = {
+                       fileRef = AD95C1880664C1E400FCB211;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A79076F48DD00AAD24E = {
+                       fileRef = AD95C18A0664C1E400FCB211;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A7C076F48FF00AAD24E = {
+                       buildActionMask = 8;
+                       dstPath = "";
+                       dstSubfolderSpec = 10;
+                       files = (
+                               ADAD4A8B076F493500AAD24E,
+                               ADAD4A88076F493100AAD24E,
+                               ADAD4A89076F493100AAD24E,
+                               ADAD4A8A076F493100AAD24E,
+                               ADAD4A82076F492A00AAD24E,
+                               ADAD4A83076F492A00AAD24E,
+                               ADAD4A84076F492A00AAD24E,
+                               ADAD4A85076F492A00AAD24E,
+                               ADAD4A86076F492A00AAD24E,
+                               ADAD4A87076F492A00AAD24E,
+                               ADAD4A80076F492300AAD24E,
+                               ADAD4A81076F492300AAD24E,
+                               ADAD4A7D076F491800AAD24E,
+                               ADAD4A7E076F491800AAD24E,
+                               ADAD4A7F076F491800AAD24E,
+                       );
+                       isa = PBXCopyFilesBuildPhase;
+                       runOnlyForDeploymentPostprocessing = 1;
+               };
+               ADAD4A7D076F491800AAD24E = {
+                       fileRef = ADAD490A076F465E00AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A7E076F491800AAD24E = {
+                       fileRef = ADAD4909076F465E00AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A7F076F491800AAD24E = {
+                       fileRef = ADAD490B076F465E00AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A80076F492300AAD24E = {
+                       fileRef = ADAD492A076F468900AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A81076F492300AAD24E = {
+                       fileRef = ADAD492B076F468900AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A82076F492A00AAD24E = {
+                       fileRef = ADAD4932076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A83076F492A00AAD24E = {
+                       fileRef = ADAD4933076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A84076F492A00AAD24E = {
+                       fileRef = ADAD4934076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A85076F492A00AAD24E = {
+                       fileRef = ADAD4935076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A86076F492A00AAD24E = {
+                       fileRef = ADAD4936076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A87076F492A00AAD24E = {
+                       fileRef = ADAD4937076F46B200AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A88076F493100AAD24E = {
+                       fileRef = ADAD494A076F46D000AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A89076F493100AAD24E = {
+                       fileRef = ADAD494B076F46D000AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A8A076F493100AAD24E = {
+                       fileRef = ADAD494C076F46D000AAD24E;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               ADAD4A8B076F493500AAD24E = {
+                       fileRef = ADEE3DDB05DD131E00F523DB;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
                ADEE3DCE05DD11C900F523DB = {
                        isa = PBXFileReference;
                        lastKnownFileType = folder;
@@ -689,7 +1056,7 @@
                        isa = PBXFileReference;
                        lastKnownFileType = wrapper.framework;
                        name = SOPEX.framework;
-                       path = /Library/Frameworks/SOPEX.framework;
+                       path = "$(USER_LIBRARY_DIR)/Frameworks/SOPEX.framework";
                        refType = 0;
                        sourceTree = "<absolute>";
                };
@@ -714,7 +1081,7 @@
                        };
                };
                ADF026F205D903AE00D2292D = {
-                       buildActionMask = 2147483647;
+                       buildActionMask = 12;
                        dstPath = "";
                        dstSubfolderSpec = 1;
                        files = (

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_Prefix.pch b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_Prefix.pch
deleted file mode 100644 (file)
index 106008f..0000000
--- a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_Prefix.pch
+++ /dev/null
@@ -1,9 +0,0 @@
-//
-// Prefix header for all source files of the 'ÇPROJECTNAMEÈ' target in the 'ÇPROJECTNAMEÈ' project
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-    #include <NGObjWeb/NGObjWeb.h>
-    #include <NGExtensions/NGExtensions.h>
-#endif

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_main.m b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_main.m
index af4bb0a59f50fee4ef6a491eab3998703844657b..ed096f7b3fcc49e772528baac2af3ddddac80d0f 100644 (file)
--- a/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_main.m
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/WebApp_main.m
@@ -7,14 +7,13 @@
 //
 
 #ifdef WITHOUT_SOPEX
-#import <NGObjWeb/NGObjWeb.h>
+#include <NGObjWeb/NGObjWeb.h>
 #define SOPEXMain WOApplicationMain
 #else
-#import <SOPEX/SOPEX.h>
+#include <SOPEX/SOPEX.h>
 #endif /* WITHOUT_SOPEX */
 
 
-int main(int argc, const char *argv[])
-{
+int main(int argc, const char *argv[]) {
     return SOPEXMain(@"Application", argc, argv);
 }

diff --git a/sopex/Templates/Project Templates/SOPE/Web Application/common.h b/sopex/Templates/Project Templates/SOPE/Web Application/common.h
new file mode 100644 (file)
index 0000000..cd70c71
--- /dev/null
+++ b/sopex/Templates/Project Templates/SOPE/Web Application/common.h
@@ -0,0 +1,15 @@
+//
+// common.h
+// Project «PROJECTNAME»
+//
+// Created by «USERNAME» on «DATE»
+//
+
+#ifndef        __«PROJECTNAME»_common_H_
+#define        __«PROJECTNAME»_common_H_
+
+#import <Foundation/Foundation.h>
+#include <NGExtensions/NGExtensions.h>
+#include <NGObjWeb/NGObjWeb.h>
+
+#endif /* __«PROJECTNAME»_common_H_ */