You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ag...@apache.org on 2012/08/17 19:00:54 UTC
[2/2] ios commit: Move Echo plugin into CordovaLib from CordovaLibApp.
Move Echo plugin into CordovaLib from CordovaLibApp.
This is required to move the exec() benchmark into MobileSpec
Project: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/commit/5a7b1cec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/tree/5a7b1cec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/diff/5a7b1cec
Branch: refs/heads/master
Commit: 5a7b1cece7c112eb32a6ec29014c0e2fc58e6f46
Parents: 07ee5c7
Author: Andrew Grieve <ag...@chromium.org>
Authored: Fri Aug 17 12:21:47 2012 -0400
Committer: Andrew Grieve <ag...@chromium.org>
Committed: Fri Aug 17 12:58:56 2012 -0400
----------------------------------------------------------------------
CordovaLib/Classes/CDVEcho.h | 23 +++++++++++
CordovaLib/Classes/CDVEcho.m | 32 ++++++++++++++++
CordovaLib/CordovaLib.xcodeproj/project.pbxproj | 8 ++++
CordovaLib/CordovaLibApp/Cordova.plist | 4 +-
CordovaLib/CordovaLibApp/EchoPlugin.h | 23 -----------
CordovaLib/CordovaLibApp/EchoPlugin.m | 32 ----------------
CordovaLib/CordovaTests.xcodeproj/project.pbxproj | 6 ---
bin/templates/project/__TESTING__/Cordova.plist | 2 +
8 files changed, 67 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/5a7b1cec/CordovaLib/Classes/CDVEcho.h
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVEcho.h b/CordovaLib/Classes/CDVEcho.h
new file mode 100644
index 0000000..b3a626a
--- /dev/null
+++ b/CordovaLib/Classes/CDVEcho.h
@@ -0,0 +1,23 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+#import "CDVPlugin.h"
+
+@interface CDVEcho : CDVPlugin
+@end
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/5a7b1cec/CordovaLib/Classes/CDVEcho.m
----------------------------------------------------------------------
diff --git a/CordovaLib/Classes/CDVEcho.m b/CordovaLib/Classes/CDVEcho.m
new file mode 100644
index 0000000..152b16e
--- /dev/null
+++ b/CordovaLib/Classes/CDVEcho.m
@@ -0,0 +1,32 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+ */
+
+
+#import "CDVEcho.h"
+#import "CDV.h"
+
+@implementation CDVEcho
+
+- (void)echo:(CDVInvokedUrlCommand*)command
+{
+ CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:[command.arguments objectAtIndex:0]];
+ [self success:pluginResult callbackId:command.callbackId];
+}
+
+@end
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/5a7b1cec/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
index 77874f4..78379d7 100644
--- a/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaLib.xcodeproj/project.pbxproj
@@ -73,6 +73,8 @@
88BA573E109BB46F00FB5E78 /* CDVAccelerometer.m in Sources */ = {isa = PBXBuildFile; fileRef = 88BA573C109BB46F00FB5E78 /* CDVAccelerometer.m */; };
C937A4561337599E002C4C79 /* CDVFileTransfer.h in Headers */ = {isa = PBXBuildFile; fileRef = C937A4541337599E002C4C79 /* CDVFileTransfer.h */; settings = {ATTRIBUTES = (Public, ); }; };
C937A4571337599E002C4C79 /* CDVFileTransfer.m in Sources */ = {isa = PBXBuildFile; fileRef = C937A4551337599E002C4C79 /* CDVFileTransfer.m */; };
+ EB80C2AC15DEA63D004D9E7B /* CDVEcho.h in Headers */ = {isa = PBXBuildFile; fileRef = EB80C2AA15DEA63D004D9E7B /* CDVEcho.h */; };
+ EB80C2AD15DEA63D004D9E7B /* CDVEcho.m in Sources */ = {isa = PBXBuildFile; fileRef = EB80C2AB15DEA63D004D9E7B /* CDVEcho.m */; };
EBA3557315ABD38C00F4DE24 /* NSArray+Comparisons.h in Headers */ = {isa = PBXBuildFile; fileRef = EBA3557115ABD38C00F4DE24 /* NSArray+Comparisons.h */; settings = {ATTRIBUTES = (Public, ); }; };
EBA3557515ABD38C00F4DE24 /* NSArray+Comparisons.m in Sources */ = {isa = PBXBuildFile; fileRef = EBA3557215ABD38C00F4DE24 /* NSArray+Comparisons.m */; };
/* End PBXBuildFile section */
@@ -158,6 +160,8 @@
AA747D9E0F9514B9006C5449 /* CordovaLib_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CordovaLib_Prefix.pch; sourceTree = SOURCE_ROOT; };
C937A4541337599E002C4C79 /* CDVFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVFileTransfer.h; path = Classes/CDVFileTransfer.h; sourceTree = "<group>"; };
C937A4551337599E002C4C79 /* CDVFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVFileTransfer.m; path = Classes/CDVFileTransfer.m; sourceTree = "<group>"; };
+ EB80C2AA15DEA63D004D9E7B /* CDVEcho.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CDVEcho.h; path = Classes/CDVEcho.h; sourceTree = "<group>"; };
+ EB80C2AB15DEA63D004D9E7B /* CDVEcho.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CDVEcho.m; path = Classes/CDVEcho.m; sourceTree = "<group>"; };
EBA3557115ABD38C00F4DE24 /* NSArray+Comparisons.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSArray+Comparisons.h"; path = "Classes/NSArray+Comparisons.h"; sourceTree = "<group>"; };
EBA3557215ABD38C00F4DE24 /* NSArray+Comparisons.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSArray+Comparisons.m"; path = "Classes/NSArray+Comparisons.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -268,6 +272,8 @@
8887FD2B1090FBE7009987E8 /* CDVContacts.m */,
8887FD2C1090FBE7009987E8 /* CDVDebugConsole.h */,
8887FD2D1090FBE7009987E8 /* CDVDebugConsole.m */,
+ EB80C2AA15DEA63D004D9E7B /* CDVEcho.h */,
+ EB80C2AB15DEA63D004D9E7B /* CDVEcho.m */,
8887FD301090FBE7009987E8 /* CDVFile.h */,
8887FD311090FBE7009987E8 /* CDVFile.m */,
8887FD341090FBE7009987E8 /* CDVInvokedUrlCommand.h */,
@@ -370,6 +376,7 @@
3E76876F156A90EE00EB6FA3 /* CDVLogger.h in Headers */,
EBA3557315ABD38C00F4DE24 /* NSArray+Comparisons.h in Headers */,
30C5F1DF15AF9E950052A00D /* CDVDevice.h in Headers */,
+ EB80C2AC15DEA63D004D9E7B /* CDVEcho.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -478,6 +485,7 @@
3E76876D156A90EE00EB6FA3 /* CDVLogger.m in Sources */,
EBA3557515ABD38C00F4DE24 /* NSArray+Comparisons.m in Sources */,
30C5F1E015AF9E950052A00D /* CDVDevice.m in Sources */,
+ EB80C2AD15DEA63D004D9E7B /* CDVEcho.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/5a7b1cec/CordovaLib/CordovaLibApp/Cordova.plist
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/Cordova.plist b/CordovaLib/CordovaLibApp/Cordova.plist
index 4725c8a..245dc43 100644
--- a/CordovaLib/CordovaLibApp/Cordova.plist
+++ b/CordovaLib/CordovaLibApp/Cordova.plist
@@ -56,8 +56,8 @@
<string>CDVCapture</string>
<key>SplashScreen</key>
<string>CDVSplashScreen</string>
- <key>EchoPlugin</key>
- <string>EchoPlugin</string>
+ <key>Echo</key>
+ <string>CDVEcho</string>
<key>Battery</key>
<string>CDVBattery</string>
</dict>
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/5a7b1cec/CordovaLib/CordovaLibApp/EchoPlugin.h
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/EchoPlugin.h b/CordovaLib/CordovaLibApp/EchoPlugin.h
deleted file mode 100644
index 3c5055d..0000000
--- a/CordovaLib/CordovaLibApp/EchoPlugin.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-#import "CDVPlugin.h"
-
-@interface EchoPlugin : CDVPlugin
-@end
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/5a7b1cec/CordovaLib/CordovaLibApp/EchoPlugin.m
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaLibApp/EchoPlugin.m b/CordovaLib/CordovaLibApp/EchoPlugin.m
deleted file mode 100644
index c1790a8..0000000
--- a/CordovaLib/CordovaLibApp/EchoPlugin.m
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
- */
-
-
-#import "EchoPlugin.h"
-#import "CDV.h"
-
-@implementation EchoPlugin
-
-- (void)echo:(CDVInvokedUrlCommand*)command
-{
- CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:[command.arguments objectAtIndex:0]];
- [self success:pluginResult callbackId:command.callbackId];
-}
-
-@end
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/5a7b1cec/CordovaLib/CordovaTests.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/CordovaLib/CordovaTests.xcodeproj/project.pbxproj b/CordovaLib/CordovaTests.xcodeproj/project.pbxproj
index 03bc898..3d1fda3 100644
--- a/CordovaLib/CordovaTests.xcodeproj/project.pbxproj
+++ b/CordovaLib/CordovaTests.xcodeproj/project.pbxproj
@@ -43,7 +43,6 @@
68A32D7E141030EB006B237C /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 686357AA141002F100DF4CF2 /* UIKit.framework */; };
68A32D7F141030F3006B237C /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 686357AC141002F100DF4CF2 /* Foundation.framework */; };
EB37019415D18B9A00BEBC43 /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EB37018C15D18B2E00BEBC43 /* libCordova.a */; };
- EB68E0BA15D2BCF400885F79 /* EchoPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = EB68E0B915D2BCF400885F79 /* EchoPlugin.m */; };
EBA3554615A731F100F4DE24 /* CDVFakeFileManager.m in Sources */ = {isa = PBXBuildFile; fileRef = EBA3554515A731F100F4DE24 /* CDVFakeFileManager.m */; };
EBA3556F15ABD0C900F4DE24 /* CDVFileTransferTests.m in Sources */ = {isa = PBXBuildFile; fileRef = EBA3556E15ABD0C900F4DE24 /* CDVFileTransferTests.m */; };
/* End PBXBuildFile section */
@@ -106,8 +105,6 @@
686357DC14100B1600DF4CF2 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
68A32D7414103017006B237C /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
EB37018115D18B2D00BEBC43 /* CordovaLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; path = CordovaLib.xcodeproj; sourceTree = "<group>"; };
- EB68E0B815D2BCF400885F79 /* EchoPlugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EchoPlugin.h; sourceTree = "<group>"; };
- EB68E0B915D2BCF400885F79 /* EchoPlugin.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = EchoPlugin.m; sourceTree = "<group>"; };
EBA3550F15A5F18900F4DE24 /* CDVWebViewTest.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CDVWebViewTest.h; sourceTree = "<group>"; };
EBA3554415A731F100F4DE24 /* CDVFakeFileManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CDVFakeFileManager.h; sourceTree = "<group>"; };
EBA3554515A731F100F4DE24 /* CDVFakeFileManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CDVFakeFileManager.m; sourceTree = "<group>"; };
@@ -200,8 +197,6 @@
30F8AE1C152129DA006625B3 /* www */,
303A4076152124BB00182201 /* AppDelegate.h */,
303A4077152124BB00182201 /* AppDelegate.m */,
- EB68E0B815D2BCF400885F79 /* EchoPlugin.h */,
- EB68E0B915D2BCF400885F79 /* EchoPlugin.m */,
303A4079152124BB00182201 /* ViewController.h */,
303A407A152124BB00182201 /* ViewController.m */,
303A406E152124BB00182201 /* Supporting Files */,
@@ -405,7 +400,6 @@
303A4074152124BB00182201 /* main.m in Sources */,
303A4078152124BB00182201 /* AppDelegate.m in Sources */,
303A407B152124BB00182201 /* ViewController.m in Sources */,
- EB68E0BA15D2BCF400885F79 /* EchoPlugin.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
http://git-wip-us.apache.org/repos/asf/incubator-cordova-ios/blob/5a7b1cec/bin/templates/project/__TESTING__/Cordova.plist
----------------------------------------------------------------------
diff --git a/bin/templates/project/__TESTING__/Cordova.plist b/bin/templates/project/__TESTING__/Cordova.plist
index 69d86a3..e9475fc 100644
--- a/bin/templates/project/__TESTING__/Cordova.plist
+++ b/bin/templates/project/__TESTING__/Cordova.plist
@@ -62,6 +62,8 @@
<string>CDVContacts</string>
<key>Debug Console</key>
<string>CDVDebugConsole</string>
+ <key>Echo</key>
+ <string>CDVEcho</string>
<key>File</key>
<string>CDVFile</string>
<key>FileTransfer</key>