http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/284396a2/src/org/waveprotocol/box/server/persistence/protos/delta-store.proto ---------------------------------------------------------------------- diff --cc src/org/waveprotocol/box/server/persistence/protos/delta-store.proto index e311c25,1890663..a160b9b --- a/src/org/waveprotocol/box/server/persistence/protos/delta-store.proto +++ b/src/org/waveprotocol/box/server/persistence/protos/delta-store.proto @@@ -1,16 -1,19 +1,20 @@@ - //Copyright 2010 Google Inc. - // - // 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 -// 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. ++ ++// 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 ++// 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. ++// 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. // // Account Data data structures. These are used as the on-disk representation of the internal // AccountData classes.
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/284396a2/src/org/waveprotocol/box/webclient/search/mock/search.html ---------------------------------------------------------------------- diff --cc src/org/waveprotocol/box/webclient/search/mock/search.html index 699adc5,a3aa998..026a0ed --- a/src/org/waveprotocol/box/webclient/search/mock/search.html +++ b/src/org/waveprotocol/box/webclient/search/mock/search.html @@@ -1,22 -1,20 +1,21 @@@ ++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";> <!-- - - 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. - + 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. --> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/284396a2/src/org/waveprotocol/protobuf/build.xml ---------------------------------------------------------------------- diff --cc src/org/waveprotocol/protobuf/build.xml index dc87002,8280506..264c5c0 --- a/src/org/waveprotocol/protobuf/build.xml +++ b/src/org/waveprotocol/protobuf/build.xml @@@ -1,4 -1,4 +1,3 @@@ --<?xml version='1.0'?> <!-- Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/284396a2/test/org/waveprotocol/wave/model/experimental/schema/good10.schema ---------------------------------------------------------------------- diff --cc test/org/waveprotocol/wave/model/experimental/schema/good10.schema index cb2fbaa,f341506..861018b --- a/test/org/waveprotocol/wave/model/experimental/schema/good10.schema +++ b/test/org/waveprotocol/wave/model/experimental/schema/good10.schema @@@ -1,16 -1,21 +1,22 @@@ <?xml version="1.0"?> ++<?xml version="1.0"?> <!-- - * 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 + * 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 + * 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. + * 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. --> <!-- A schema featuring a nested reference --> <schema> @@@ -38,3 -43,3 +44,29 @@@ </definition> <root name="test"/> </schema> ++<!-- A schema featuring a nested reference --> ++<schema> ++ <definition name="test"> ++ <element name="element0"> ++ <reference name="definition1"/> ++ </element> ++ </definition> ++ <definition name="definition1"> ++ <attribute name="attribute1" values="value1" required="false"/> ++ <element name="element1"> ++ <element name="element4"/> ++ </element> ++ <reference name="definition2"/> ++ <reference name="definition3"/> ++ </definition> ++ <definition name="definition2"> ++ <element name="element2"> ++ <element name="element4"/> ++ </element> ++ <attribute name="attribute2" values="value2" required="false"/> ++ </definition> ++ <definition name="definition3"> ++ <element name="element3"/> ++ </definition> ++ <root name="test"/> ++</schema>
