Instruction
stringlengths
14
778
input_code
stringlengths
0
4.24k
output_code
stringlengths
1
5.44k
Disable messaging in global search.
<?xml version="1.0" encoding="utf-8"?> <!-- /* ** Copyright 2009, 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 ** ** 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. */ --> <searchable xmlns:android="http://schemas.android.com/apk/res/android" android:label="@string/search_label" android:hint="@string/search_hint" android:searchSettingsDescription="@string/search_setting_description" android:searchSuggestAuthority="com.android.mms.SuggestionsProvider" android:searchSuggestSelection="pattern" android:searchSuggestIntentAction="android.intent.action.SEARCH" android:imeOptions="actionSearch" android:includeInGlobalSearch="true" />
<?xml version="1.0" encoding="utf-8"?> <!-- /* ** Copyright 2009, 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 ** ** 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. */ --> <searchable xmlns:android="http://schemas.android.com/apk/res/android" android:label="@string/search_label" android:hint="@string/search_hint" android:searchSettingsDescription="@string/search_setting_description" android:searchSuggestAuthority="com.android.mms.SuggestionsProvider" android:searchSuggestSelection="pattern" android:searchSuggestIntentAction="android.intent.action.SEARCH" android:imeOptions="actionSearch" android:includeInGlobalSearch="false" />
Enable workflow deploy on startup and remove demo.
<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.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. --> <beans> <!-- A simple class that is initialized by Spring --> <bean id="changeme.exampleBean" class="org.alfresco.demoamp.Demo" init-method="init" /> <!-- A simple module component that will be executed once --> <bean id="changeme.exampleComponent" class="org.alfresco.demoamp.DemoComponent" parent="module.baseComponent" > <property name="moduleId" value="${project.artifactId}" /> <!-- See module.properties --> <property name="name" value="exampleComponent" /> <property name="description" value="A demonstration component" /> <property name="sinceVersion" value="2.0" /> <property name="appliesFromVersion" value="2.0" /> <property name="nodeService" ref="NodeService" /> <property name="nodeLocatorService" ref="nodeLocatorService" /> </bean> </beans>
<?xml version='1.0' encoding='UTF-8'?> <!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.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. --> <beans> <bean id="${project.artifactId}.workflowBootstrap" parent="workflowDeployer"> <property name="workflowDefinitions"> <list> <props> <prop key="engineId">activiti</prop> <prop key="location">alfresco/module/${project.artifactId}/workflows/wf1.bpmn</prop> <prop key="mimetype">text/xml</prop> <prop key="redeploy">true</prop> </props> </list> </property> </bean> </beans>
Remove 'application' as a provided dependency.
<?xml version="1.0"?> <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <!-- This module collects all dependencies applications need to create container components. --> <!-- It should be considered an external Vespa API. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> </parent> <artifactId>container</artifactId> <version>6-SNAPSHOT</version> <packaging>jar</packaging> <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>vespaclient-container-plugin</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>application</artifactId> <version>${project.version}</version> </dependency> </dependencies> </project>
<?xml version="1.0"?> <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. --> <!-- This module collects all dependencies applications need to create container components. --> <!-- It should be considered an external Vespa API. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>com.yahoo.vespa</groupId> <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> </parent> <artifactId>container</artifactId> <version>6-SNAPSHOT</version> <packaging>jar</packaging> <dependencies> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>container-dev</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> <artifactId>vespaclient-container-plugin</artifactId> <version>${project.version}</version> </dependency> </dependencies> </project>
Replace commented XML with TODO
<?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (C) 2021 The Android Open Source Project. ~ ~ 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. --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent"> <!-- <androidx.fragment.app.FragmentContainerView--> <!-- android:id="@+id/nav_host_fragment"--> <!-- android:name="androidx.navigation.fragment.NavHostFragment"--> <!-- android:layout_width="match_parent"--> <!-- android:layout_height="match_parent"--> <!-- app:defaultNavHost="true"--> <!-- app:navGraph="@navigation/mobile_navigation"--> <!-- app:layout_constraintBottom_toBottomOf="parent"--> <!-- app:layout_constraintLeft_toLeftOf="parent"--> <!-- app:layout_constraintRight_toRightOf="parent"--> <!-- app:layout_constraintTop_toTopOf="parent" />--> </androidx.constraintlayout.widget.ConstraintLayout>
<?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (C) 2021 The Android Open Source Project. ~ ~ 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. --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent"> <!-- TODO: Add a FragmentContainerView with navigation/mobile_navigation as the navHost --> </androidx.constraintlayout.widget.ConstraintLayout>
Use normal textStyle for path TextView
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2012 GitHub 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 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. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/rl_path" style="@style/HeaderListItem" > <TextView android:id="@+id/tv_folder_icon" style="@style/PrimaryIcon" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:text="@string/icon_folders" /> <TextView android:id="@+id/tv_path" style="@style/HeaderTitleText" android:layout_centerVertical="true" android:layout_toRightOf="@id/tv_folder_icon" android:lineSpacingExtra="2dp" android:paddingTop="2dp" android:singleLine="false" android:textColorLink="@color/text_link" android:textStyle="bold" /> </RelativeLayout>
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2012 GitHub 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 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. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/rl_path" style="@style/HeaderListItem" > <TextView android:id="@+id/tv_folder_icon" style="@style/PrimaryIcon" android:layout_alignParentLeft="true" android:layout_centerVertical="true" android:text="@string/icon_folders" /> <TextView android:id="@+id/tv_path" style="@style/HeaderTitleText" android:layout_centerVertical="true" android:layout_toRightOf="@id/tv_folder_icon" android:lineSpacingExtra="2dp" android:paddingTop="2dp" android:singleLine="false" android:textColorLink="@color/text_link" android:textStyle="normal" /> </RelativeLayout>
Remove empty export tags and update url
<?xml version="1.0"?> <package> <name>aico</name> <version>3.0.0</version> <description>Implementation of the Approximate Inference Control algorithm (AICO)</description> <maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer> <license>BSD</license> <url type="website">https://bitbucket.org/IPAB-SLMC/exotica</url> <buildtool_depend>catkin</buildtool_depend> <build_depend>exotica</build_depend> <build_depend>roscpp</build_depend> <build_depend>task_definition</build_depend> <build_depend>task_map</build_depend> <build_depend>liblapack-dev</build_depend> <build_depend>f2c</build_depend> <run_depend>exotica</run_depend> <run_depend>roscpp</run_depend> <run_depend>task_definition</run_depend> <run_depend>task_map</run_depend> <run_depend>liblapack-dev</run_depend> <run_depend>f2c</run_depend> <!-- The export tag contains other, unspecified, tags --> <export> <!-- You can specify that this package is a metapackage here: --> <!-- <metapackage/> --> <!-- Other tools can request additional information be placed here --> </export> </package>
<?xml version="1.0"?> <package> <name>aico</name> <version>3.0.0</version> <description>Implementation of the Approximate Inference Control algorithm (AICO)</description> <maintainer email="v.ivan@ed.ac.uk">Vladimir Ivan</maintainer> <license>BSD</license> <url type="website">https://github.com/openhumanoids/exotica</url> <buildtool_depend>catkin</buildtool_depend> <build_depend>exotica</build_depend> <build_depend>roscpp</build_depend> <build_depend>task_definition</build_depend> <build_depend>task_map</build_depend> <build_depend>liblapack-dev</build_depend> <build_depend>f2c</build_depend> <run_depend>exotica</run_depend> <run_depend>roscpp</run_depend> <run_depend>task_definition</run_depend> <run_depend>task_map</run_depend> <run_depend>liblapack-dev</run_depend> <run_depend>f2c</run_depend> </package>
Enable proofreading in commit messages
<?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="IssueNavigationConfiguration"> <option name="links"> <list> <IssueNavigationLink> <option name="issueRegexp" value="#(\d+)" /> <option name="linkRegexp" value="https://github.com/intellij-rust/intellij-rust/issues/$1" /> </IssueNavigationLink> </list> </option> </component> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$" vcs="Git" /> </component> </project>
<?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="CommitMessageInspectionProfile"> <profile version="1.0"> <inspection_tool class="GrazieCommit" enabled="true" level="TYPO" enabled_by_default="true" /> </profile> </component> <component name="IssueNavigationConfiguration"> <option name="links"> <list> <IssueNavigationLink> <option name="issueRegexp" value="#(\d+)" /> <option name="linkRegexp" value="https://github.com/intellij-rust/intellij-rust/issues/$1" /> </IssueNavigationLink> </list> </option> </component> <component name="VcsDirectoryMappings"> <mapping directory="$PROJECT_DIR$" vcs="Git" /> </component> </project>
Use relative links in the menu
<?xml version="1.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. --><project name="Apache Commons JCI"> <bannerRight> <name>Apache Commons JCI</name> <src>jci-logo-white.png</src> <href>http://commons.apache.org/jci/</href> </bannerRight> <body> <menu name="Apache Commons JCI"> <item name="About" href="http://commons.apache.org/jci/index.html"/> <item name="Usage" href="http://commons.apache.org/jci/usage.html"/> <item name="FAQ" href="http://commons.apache.org/jci/faq.html"/> <item name="Issue Tracking" href="http://commons.apache.org/jci/issue-tracking.html"/> <item name="Downloads" href="http://commons.apache.org/jci/downloads.html"/> </menu> </body> </project>
<?xml version="1.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. --><project name="Apache Commons JCI"> <bannerRight> <name>Apache Commons JCI</name> <src>jci-logo-white.png</src> <href>http://commons.apache.org/jci/</href> </bannerRight> <body> <menu name="Apache Commons JCI"> <item name="About" href="index.html"/> <item name="Usage" href="usage.html"/> <item name="FAQ" href="faq.html"/> <item name="Issue Tracking" href="issue-tracking.html"/> <item name="Downloads" href="downloads.html"/> </menu> </body> </project>
Fix Quick share menu item.
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2014 The Chromium Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeightSmall"> <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" android:layout_weight="1" android:background="?android:attr/listChoiceBackgroundIndicator" android:gravity="center_vertical" android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingEnd="9dp" android:singleLine="true" android:textAppearance="?android:attr/textAppearanceLargePopupMenu" /> <org.chromium.chrome.browser.widget.TintedImageButton android:id="@+id/button" android:layout_width="56dp" android:layout_height="match_parent" android:background="?android:attr/listChoiceBackgroundIndicator" android:paddingStart="16dp" android:paddingEnd="16dp" android:paddingTop="12dp" android:paddingBottom="12dp" android:scaleType="fitCenter" /> </LinearLayout>
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2014 The Chromium Authors. All rights reserved. Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:chrome="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeightSmall"> <TextView android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_gravity="start" android:layout_weight="1" android:background="?android:attr/listChoiceBackgroundIndicator" android:gravity="center_vertical" android:paddingStart="?android:attr/listPreferredItemPaddingStart" android:paddingEnd="9dp" android:singleLine="true" android:textAppearance="?android:attr/textAppearanceLargePopupMenu" /> <org.chromium.chrome.browser.widget.TintedImageButton android:id="@+id/button" android:layout_width="56dp" android:layout_height="match_parent" android:background="?android:attr/listChoiceBackgroundIndicator" android:paddingStart="16dp" android:paddingEnd="16dp" android:paddingTop="12dp" android:paddingBottom="12dp" android:scaleType="fitCenter" chrome:tint="@null" /> </LinearLayout>
Add personal information to plugin descriptor
<?xml version="1.0" encoding="UTF-8"?> <teamcity-plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:shemas-jetbrains-com:teamcity-plugin-v1-xml"> <info> <name>teamcity-web-ssh</name> <display-name>teamcity-web-ssh</display-name> <version>@Version@</version> <description>Plugin description</description> <download-url>Plugin download URL</download-url> <email>Plugin author e-mail</email> <vendor> <name>@VendorName@</name> <url>@VendorURL@</url> <logo>Plugin vendor logo URL</logo> </vendor> </info> <deployment use-separate-classloader="true" /> </teamcity-plugin>
<?xml version="1.0" encoding="UTF-8"?> <teamcity-plugin xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:shemas-jetbrains-com:teamcity-plugin-v1-xml"> <info> <name>teamcity-web-ssh</name> <display-name>Web Ssh</display-name> <version>@Version@</version> <description>Plugin for connecting to ssh via web ssh directly from Teamcity</description> <download-url>Plugin download URL</download-url> <email>systray@yandex.ru</email> <vendor> <name>Grigory Chernyshev [mail.ru]</name> <url>http://mail.ru</url> <logo>Plugin vendor logo URL</logo> </vendor> </info> <deployment use-separate-classloader="true" /> </teamcity-plugin>
Rename PURL to Resolver in project's root POM
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>gov.hawaii.digitalarchives</groupId> <artifactId>pid-web-service</artifactId> <name>PID Web Service</name> <packaging>pom</packaging> <version>0.1.0-SNAPSHOT</version> <url>http://digitalarchives.hawaii.gov</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version> <java.version>1.8</java.version> </properties> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>${maven-compiler-plugin.version}</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> </configuration> </plugin> </plugins> </build> <modules> <module>Minter</module> <module>PURL</module> </modules> </project>
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>gov.hawaii.digitalarchives</groupId> <artifactId>pid-web-service</artifactId> <name>PID Web Service</name> <packaging>pom</packaging> <version>0.1.0-SNAPSHOT</version> <url>http://digitalarchives.hawaii.gov</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version> <java.version>1.8</java.version> </properties> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>${maven-compiler-plugin.version}</version> <configuration> <source>${java.version}</source> <target>${java.version}</target> </configuration> </plugin> </plugins> </build> <modules> <module>Minter</module> <module>Resolver</module> </modules> </project>
Fix the Content is not allowed in prolog error
/* * 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. */ <faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" version="2.0"> <application> </application> </faces-config>
/* * 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. */ <?xml version='1.0' encoding='UTF-8'?> <faces-config xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd" version="2.0"> </faces-config>
Add support for default excludes (Anagnostopoulos Kostis, ankostis@gmail.com) MOJO-448: Add support for absolute paths (Anagnostopoulos Kostis, ankostis@gmail.com)
<document> <properties> <title>Changes in the Maven XML Plugin</title> </properties> <body> <release version="0.0.1" date="25-Jun-2006"> <action dev="jochen" type="add"> Initial release </action> </release> </body> </document>
<document> <properties> <title>Changes in the Maven XML Plugin</title> </properties> <body> <release version="0.2" date="Not yet released"> <action dev="jochen" type="fix" issue="MOJO-446" due-to="Anagnostopoulos Kostis" due-to-email="ankostis@gmail.com"> Add use of the default excludes. Also add the configuration parameter skipDefaultExcludes for turning them off. </action> <action dev="jochen" type="fix" issue="MOJO-448" due-to="Anagnostopoulos Kostis" due-to-email="ankostis@gmail.com"> Absolute paths have been unsupported. </action> </release> <release version="0.1" date="25-Jun-2006"> <action dev="jochen" type="add"> Initial release </action> </release> </body> </document>
Remove some GPU overdraw around the send button
<?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2013 IRCCloud, Ltd. ~ ~ 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. --> <ImageButton xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="wrap_content" android:layout_height="match_parent" android:background="#fff" android:paddingLeft="6dp" android:paddingRight="4dp" android:paddingBottom="4dp" android:scaleType="fitEnd" android:contentDescription="Send" android:src="@drawable/ic_action_send" />
<?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2013 IRCCloud, Ltd. ~ ~ 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. --> <ImageButton xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="match_parent" android:background="@null" android:paddingLeft="6dp" android:paddingRight="4dp" android:paddingBottom="4dp" android:scaleType="fitEnd" android:contentDescription="Send" android:src="@drawable/ic_action_send" />
Fix manifest and set minSdkVersion to 7 (Eclair)
<?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.github.eddieringle.android.libs.undergarment" android:versionCode="1" android:versionName="1.0"> <application android:label="@string/app_name" android:icon="@drawable/ic_launcher"> <activity android:name="ACTIVITY_ENTRY_NAME" android:label="@string/app_name"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> </application> </manifest>
<?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.github.eddieringle.android.libs.undergarment" android:versionCode="2012081800" android:versionName="1.0"> <uses-sdk android:minSdkVersion="7" /> </manifest>
Make code only appear on product view page
<?xml version="1.0"?> <layout> <default> <reference name="before_body_end"> <block type="page/html_head" name="extra_js" as="sdJs" after="-" template="somethingdigital/page/html/footer-js.phtml"> <action method="addItem"><type>skin_js</type><name>js/somethingdigital/ajaxaddtocart.js</name></action> </block> </reference> </default> </layout>
<?xml version="1.0"?> <layout> <catalog_product_view> <reference name="before_body_end"> <block type="page/html_head" name="extra_js" as="sdJs" after="-" template="somethingdigital/page/html/footer-js.phtml"> <action method="addItem"><type>skin_js</type><name>js/somethingdigital/ajaxaddtocart.js</name></action> </block> </reference> </catalog_product_view> </layout>
Add string for content description
<resources> <string name="app_name">serleena</string> <string name="title_activity_serleena">SerleenaActivity</string> <string name="hello_world">Hello world!</string> <string name="action_settings">Settings</string> <string name="heartDesc">Cuore</string> </resources>
<resources> <string name="app_name">serleena</string> <string name="title_activity_serleena">SerleenaActivity</string> <string name="hello_world">Hello world!</string> <string name="action_settings">Settings</string> <string name="heartDesc">Cuore</string> <string name="weatherDesc">Indicazione meteo</string> </resources>
Remove Netsensia tests from PHPUnit config
<phpunit backupGlobals="false" backupStaticAttributes="false" bootstrap="Bootstrap.php" colors="false" strict="true" syntaxCheck="false" verbose="true"> <testsuite name="Netsensia ZF2 Skeleton"> <directory>../module/Application/tests/Application</directory> <directory>../module/Netsensia/tests/Netsensia</directory> </testsuite> <filter> <whitelist addUncoveredFilesFromWhitelist="true"> <directory suffix=".php">./../module/Netsensia/src</directory> <directory suffix=".php">./../module/Application/src</directory> </whitelist> </filter> </phpunit>
<phpunit backupGlobals="false" backupStaticAttributes="false" bootstrap="Bootstrap.php" colors="false" strict="true" syntaxCheck="false" verbose="true"> <testsuite name="Netsensia ZF2 Skeleton"> <directory>../module/Application/tests/Application</directory> </testsuite> <filter> <whitelist addUncoveredFilesFromWhitelist="true"> <directory suffix=".php">./../module/Netsensia/src</directory> <directory suffix=".php">./../module/Application/src</directory> </whitelist> </filter> </phpunit>
Remove development time optimization from demo widgetset
<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.7.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/1.7.0/distro-source/core/src/gwt-module.dtd"> <module> <inherits name="com.vaadin.DefaultWidgetSet" /> <inherits name="org.vaadin.teemu.switchui.SwitchComponentWidgetset" /> <set-property name="user.agent" value="safari"/> </module>
<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 1.7.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/1.7.0/distro-source/core/src/gwt-module.dtd"> <module> <inherits name="com.vaadin.DefaultWidgetSet" /> <inherits name="org.vaadin.teemu.switchui.SwitchComponentWidgetset" /> </module>
Revert "commit to be used as the SHA of the previous plural versions"
<?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Kid Mode</string> <string name="pd_app_name">Parent Dashboard</string> <!-- This is a comment --> <string name="app_current">current</string> <string name="cancel">Cancel</string> <string name="delete">Delete</string> <string name="not_in_es">This key not in spanish</string> <string name="debug_key">Should be ignored</string> <plurals name="user_count"> <item quantity="one">1 user</item> <item quantity="many">%d users</item> </plurals> <plurals name="fish_count"> <item quantity="one">1 fishes</item> <item quantity="many">%d fish</item> </plurals> </resources>
<?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Kid Mode</string> <string name="pd_app_name">Parent Dashboard</string> <!-- This is a comment --> <string name="app_current">current</string> <string name="cancel">Cancel</string> <string name="delete">Delete</string> <string name="not_in_es">This key not in spanish</string> <string name="debug_key">Should be ignored</string> <plurals name="user_count"> <item quantity="one">1 user</item> <item quantity="many">%d users</item> </plurals> <plurals name="user_count"> <item quantity="one">1 user</item> <item quantity="many">%d users</item> </plurals> <plurals name="fish_count"> <item quantity="one">1 fish</item> <item quantity="many">%d fish</item> </plurals> </resources>
Update security allow css and scripts
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd"> <http pattern="/login.html*" security="none" /> <http auto-config="true"> <intercept-url pattern="/**" access="ROLE_USER" /> <form-login login-page="/login.html" default-target-url="/index.html" authentication-failure-url="/login.html?error" username-parameter="username" password-parameter="password" /> <logout logout-success-url="/login.html?logout" /> </http> <authentication-manager> <authentication-provider> <user-service> <user name="wpetit" password="wpetit" authorities="ROLE_USER" /> </user-service> </authentication-provider> </authentication-manager> </beans:beans>
<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd"> <http pattern="/login.html*" security="none" /> <http pattern="/css/**" security="none" /> <http pattern="/script/**" security="none" /> <http auto-config="true"> <intercept-url pattern="/**" access="ROLE_USER" /> <form-login login-page="/login.html" default-target-url="/index.html" authentication-failure-url="/login.html?error" username-parameter="username" password-parameter="password" /> <logout logout-success-url="/login.html?logout" /> </http> <authentication-manager> <authentication-provider> <user-service> <user name="wpetit" password="wpetit" authorities="ROLE_USER" /> </user-service> </authentication-provider> </authentication-manager> </beans:beans>
Change in name in config that must be coming from a new EAP (upgraded to 10597)
<component name="InspectionProjectProfileManager"> <settings> <option name="PROJECT_PROFILE" value="Project Default" /> <option name="USE_PROJECT_PROFILE" value="true" /> <version value="1.0" /> <list size="5"> <item index="0" class="java.lang.String" itemvalue="MISSPELLED" /> <item index="1" class="java.lang.String" itemvalue="SERVER PROBLEM" /> <item index="2" class="java.lang.String" itemvalue="INFO" /> <item index="3" class="java.lang.String" itemvalue="WARNING" /> <item index="4" class="java.lang.String" itemvalue="ERROR" /> </list> </settings> </component>
<component name="InspectionProjectProfileManager"> <settings> <option name="PROJECT_PROFILE" value="Project Default" /> <option name="USE_PROJECT_PROFILE" value="true" /> <version value="1.0" /> <list size="5"> <item index="0" class="java.lang.String" itemvalue="TYPO" /> <item index="1" class="java.lang.String" itemvalue="SERVER PROBLEM" /> <item index="2" class="java.lang.String" itemvalue="INFO" /> <item index="3" class="java.lang.String" itemvalue="WARNING" /> <item index="4" class="java.lang.String" itemvalue="ERROR" /> </list> </settings> </component>
Remove top 40 from excluded genres list
<?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2017 Reto Inderbitzin (mail@indr.ch) ~ ~ For the full copyright and license information, please view ~ the LICENSE file that was distributed with this source code. --> <resources> <string-array name="excluded_from_top_genres"> <item>adult contemporary</item> <item>bbc</item> <item>christian</item> <item>college radio</item> <item>commercial</item> <item>community radio</item> <item>hot adult contemporary</item> <item>information</item> <item>local music</item> <item>local news</item> <item>music</item> <item>npr</item> <item>public radio</item> </string-array> <string-array name="excluded_from_more_genres"> <item>.977</item> <item>192kbps</item> <item>320kbps</item> <item>apm</item> <item>m3u8</item> <item>outre-mer</item> <item>pri</item> <item>top 40</item> <item>variety</item> </string-array> </resources>
<?xml version="1.0" encoding="utf-8"?> <!-- ~ Copyright (c) 2017 Reto Inderbitzin (mail@indr.ch) ~ ~ For the full copyright and license information, please view ~ the LICENSE file that was distributed with this source code. --> <resources> <string-array name="excluded_from_top_genres"> <item>adult contemporary</item> <item>bbc</item> <item>christian</item> <item>college radio</item> <item>commercial</item> <item>community radio</item> <item>hot adult contemporary</item> <item>information</item> <item>local music</item> <item>local news</item> <item>music</item> <item>npr</item> <item>public radio</item> </string-array> <string-array name="excluded_from_more_genres"> <item>.977</item> <item>192kbps</item> <item>320kbps</item> <item>apm</item> <item>m3u8</item> <item>outre-mer</item> <item>pri</item> <item>variety</item> </string-array> </resources>
Fix for broken ErrorPageFormTest on AS7
<?xml version="1.0" encoding="UTF-8"?> <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" metadata-complete="false"> <error-page> <location>/faces/error.xhtml</location> </error-page> </web-app>
<?xml version="1.0" encoding="UTF-8"?> <web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" metadata-complete="false"> <error-page> <error-code>404</error-code> <location>/faces/error.xhtml</location> </error-page> </web-app>
Remove references to older versions
<?xml version="1.0"?> <extension key="nz.co.fuzion.notificationlog" type="module"> <file>notificationlog</file> <name>Retry payment processor notifications</name> <description>Retry notifications from the system log.</description> <license>AGPL-3.0</license> <maintainer> <author>Eileen</author> <email>eileen@fuzion.co.nz</email> </maintainer> <urls> <url desc="Main Extension Page">https://github.com/eileenmcnaughton/nz.co.fuzion.notificationlog</url> <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2018-06-29</releaseDate> <version>1.1</version> <develStage>beta</develStage> <compatibility> <ver>4.6</ver> <ver>4.7</ver> <ver>5.0</ver> </compatibility> <civix> <namespace>CRM/Notificationlog</namespace> </civix> </extension>
<?xml version="1.0"?> <extension key="nz.co.fuzion.notificationlog" type="module"> <file>notificationlog</file> <name>Retry payment processor notifications</name> <description>Retry notifications from the system log.</description> <license>AGPL-3.0</license> <maintainer> <author>Eileen</author> <email>eileen@fuzion.co.nz</email> </maintainer> <urls> <url desc="Main Extension Page">https://github.com/eileenmcnaughton/nz.co.fuzion.notificationlog</url> <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> <releaseDate>2018-06-29</releaseDate> <version>1.1</version> <develStage>stable</develStage> <compatibility> <ver>5.0</ver> </compatibility> <civix> <namespace>CRM/Notificationlog</namespace> </civix> </extension>
Add fabric8 plugin for deploying controller
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>io.enmasse.iot</groupId> <artifactId>enmasse-iot-bom</artifactId> <version>1.0-SNAPSHOT</version> <relativePath>../bom</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>controller</artifactId> <dependencies> <dependency> <groupId>io.vertx</groupId> <artifactId>vertx-proton</artifactId> <version>${vertx.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <version>${slf4j.version}</version> </dependency> </dependencies> </project>
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>io.enmasse.iot</groupId> <artifactId>enmasse-iot-bom</artifactId> <version>1.0-SNAPSHOT</version> <relativePath>../bom</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>controller</artifactId> <dependencies> <dependency> <groupId>io.vertx</groupId> <artifactId>vertx-proton</artifactId> <version>${vertx.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-simple</artifactId> <version>${slf4j.version}</version> </dependency> </dependencies> <build> <plugins> <plugin> <groupId>io.fabric8</groupId> <artifactId>fabric8-maven-plugin</artifactId> <version>3.5.31</version> </plugin> </plugins> </build> </project>
Fix relations group header padding
<?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/details_card" android:layout_width="fill_parent" android:layout_height="48dp" android:layout_gravity="center" android:background="@color/card_light_green" android:orientation="horizontal"> <ImageView android:id="@+id/indicator" android:layout_width="22dp" android:layout_height="22dp" android:layout_alignParentRight="true" android:layout_centerVertical="true" android:layout_marginRight="16dp" android:tag="min" /> <TextView android:id="@+id/name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:layout_marginLeft="16dp" android:ellipsize="end" android:singleLine="true" android:text="@string/layout_card_loading" android:textColor="#000000" android:textSize="14sp" /> </RelativeLayout>
<?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/details_card" android:layout_width="fill_parent" android:layout_height="48dp" android:layout_gravity="center" android:background="@color/card_light_green" android:orientation="horizontal"> <TextView android:id="@+id/name" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_centerVertical="true" android:ellipsize="end" android:paddingLeft="?android:attr/expandableListPreferredItemPaddingLeft" android:singleLine="true" android:text="@string/layout_card_loading" android:textColor="#000000" android:textSize="14sp" /> </RelativeLayout>
Rename "Print Payment Suggestion" to "Generate P S"
<?xml version="1.0" encoding="utf-8"?> <openerp> <data> <!-- View for Payment Suggestions. --> <record id="payment_suggestion_view" model="ir.ui.view"> <field name="name">payment.suggestion.view</field> <field name="model">payment.suggestion</field> <field name="arch" type="xml"> <field name="voucher_ids" /> </field> </record> <!-- Contextual action to generate a Payment Suggestion. --> <record id="action_payment_suggestion" model="ir.actions.server"> <field name="name">Print Payment Suggestion</field> <field name="type">ir.actions.server</field> <field name="model_id" ref="model_account_voucher" /> <field name="state">code</field> <field name="code"> action = object.print_payment_suggestion() </field> </record> <record id="value_contextual_action_payment_suggestion" model="ir.values"> <field name="name">Print Payment Suggestion</field> <field name="key2">client_action_multi</field> <field name="value" eval="'ir.actions.server,%d' % action_payment_suggestion" /> <field name="model">account.voucher</field> </record> </data> </openerp>
<?xml version="1.0" encoding="utf-8"?> <openerp> <data> <!-- View for Payment Suggestions. --> <record id="payment_suggestion_view" model="ir.ui.view"> <field name="name">payment.suggestion.view</field> <field name="model">payment.suggestion</field> <field name="arch" type="xml"> <field name="voucher_ids" /> </field> </record> <!-- Contextual action to generate a Payment Suggestion. --> <record id="action_payment_suggestion" model="ir.actions.server"> <field name="name">Generate Payment Suggestion</field> <field name="type">ir.actions.server</field> <field name="model_id" ref="model_account_voucher" /> <field name="state">code</field> <field name="code"> action = object.print_payment_suggestion() </field> </record> <record id="value_contextual_action_payment_suggestion" model="ir.values"> <field name="name">Generate Payment Suggestion</field> <field name="key2">client_action_multi</field> <field name="value" eval="'ir.actions.server,%d' % action_payment_suggestion" /> <field name="model">account.voucher</field> </record> </data> </openerp>
Remove unused watch view stub
<?xml version="1.0" encoding="utf-8"?> <!-- <android.support.wearable.view.WatchViewStub xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/watch_view_stub" android:layout_width="match_parent" android:layout_height="match_parent" app:rectLayout="@layout/rect_activity_main_menu" app:roundLayout="@layout/round_activity_main_menu" tools:context=".MainActivity" tools:deviceIds="wear"> </android.support.wearable.view.WatchViewStub> --> <android.support.wearable.view.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/box_inset_layout" android:layout_height="match_parent" android:layout_width="match_parent" tools:context=".ui.activity.MainActivity" tools:deviceIds="wear" app:layout_box="all" android:padding="15dp"> <FrameLayout android:id="@+id/frame_layout" android:layout_height="match_parent" android:layout_width="match_parent" app:layout_box="left|bottom|right"> <android.support.wearable.view.WearableListView android:id="@+id/lv_main_menu" android:layout_height="match_parent" android:layout_width="match_parent"> </android.support.wearable.view.WearableListView> </FrameLayout> </android.support.wearable.view.BoxInsetLayout>
<?xml version="1.0" encoding="utf-8"?> <android.support.wearable.view.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/box_inset_layout" android:layout_height="match_parent" android:layout_width="match_parent" tools:context=".ui.activity.MainActivity" tools:deviceIds="wear" app:layout_box="all" android:padding="15dp"> <FrameLayout android:id="@+id/frame_layout" android:layout_height="match_parent" android:layout_width="match_parent" app:layout_box="left|bottom|right"> <android.support.wearable.view.WearableListView android:id="@+id/lv_main_menu" android:layout_height="match_parent" android:layout_width="match_parent"> </android.support.wearable.view.WearableListView> </FrameLayout> </android.support.wearable.view.BoxInsetLayout>
Add "jids" to .idea dictionary
<component name="ProjectDictionaryState"> <dictionary name="Elad"> <words> <w>busybox</w> <w>shutapp</w> </words> </dictionary> </component>
<component name="ProjectDictionaryState"> <dictionary name="Elad"> <words> <w>busybox</w> <w>jids</w> <w>shutapp</w> </words> </dictionary> </component>
Revert "Removed the virtual host"
<?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2014 Juraci Paixão Kröhling <juraci at kroehling.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program 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 General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. --> <jboss-web xmlns="http://www.jboss.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-web_5_1.xsd"> <context-root>/</context-root> <security-domain>keycloak</security-domain> </jboss-web>
<?xml version="1.0" encoding="UTF-8"?> <!-- Copyright (C) 2014 Juraci Paixão Kröhling <juraci at kroehling.de> This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program 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 General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. --> <jboss-web xmlns="http://www.jboss.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee http://www.jboss.org/j2ee/schema/jboss-web_5_1.xsd"> <context-root>/</context-root> <virtual-host>cascaio-api</virtual-host> <security-domain>keycloak</security-domain> </jboss-web>
Add placeholder when loading thumbnails
<?xml version="1.0" encoding="utf-8"?> <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" tools:parentTag="android.widget.FrameLayout"> <ImageView android:id="@+id/message_image" android:layout_width="40dp" android:layout_height="40dp"/> <com.pr0gramm.app.ui.views.RecyclerViewCompatibleTextView android:id="@+id/message_text" style="@style/TextAppearance.AppCompat.Body1" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="56dp" android:layout_marginBottom="40dp" android:singleLine="false" tools:text="@string/dummy_text" android:layout_marginStart="56dp"/> <com.pr0gramm.app.ui.views.SenderInfoView android:id="@+id/message_sender_info" android:layout_width="match_parent" android:layout_height="32dp" android:layout_gravity="bottom" android:layout_marginLeft="56dp" android:layout_below="@+id/message_text" android:layout_marginStart="56dp" android:layout_marginTop="4dp"/> </merge>
<?xml version="1.0" encoding="utf-8"?> <merge xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" tools:parentTag="android.widget.FrameLayout"> <ImageView android:id="@+id/message_image" android:background="@color/grey_700" android:layout_width="40dp" android:layout_height="40dp"/> <com.pr0gramm.app.ui.views.RecyclerViewCompatibleTextView android:id="@+id/message_text" style="@style/TextAppearance.AppCompat.Body1" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="56dp" android:layout_marginBottom="40dp" android:singleLine="false" tools:text="@string/dummy_text" android:layout_marginStart="56dp"/> <com.pr0gramm.app.ui.views.SenderInfoView android:id="@+id/message_sender_info" android:layout_width="match_parent" android:layout_height="32dp" android:layout_gravity="bottom" android:layout_marginLeft="56dp" android:layout_below="@+id/message_text" android:layout_marginStart="56dp" android:layout_marginTop="4dp"/> </merge>
Remove broken python-evdev run-depend for now
<?xml version="1.0"?> <package> <name>lg_nav_to_device</name> <version>0.0.1</version> <description>Subscribes to events published over ros, and writes them back into a virtual device</description> <maintainer email="jacob@endpoint.com">jacob</maintainer> <license>TODO</license> <url type="website">https://github.com/EndPointCorp/lg_ros_nodes</url> <buildtool_depend>catkin</buildtool_depend> <build_depend>rospy</build_depend> <run_depend>rospy</run_depend> <run_depend>python-evdev</run_depend> <run_depend>geometry_msgs</run_depend> </package>
<?xml version="1.0"?> <package> <name>lg_nav_to_device</name> <version>0.0.1</version> <description>Subscribes to events published over ros, and writes them back into a virtual device</description> <maintainer email="jacob@endpoint.com">jacob</maintainer> <license>TODO</license> <url type="website">https://github.com/EndPointCorp/lg_ros_nodes</url> <buildtool_depend>catkin</buildtool_depend> <build_depend>rospy</build_depend> <run_depend>rospy</run_depend> <!--<run_depend>python-evdev</run_depend>--> <run_depend>geometry_msgs</run_depend> </package>
Update project URL and set issue management
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.alexrnl</groupId> <artifactId>commons</artifactId> <packaging>jar</packaging> <version>1.0-SNAPSHOT</version> <name>Commons</name> <url>http://maven.apache.org</url> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.11</version> <scope>test</scope> </dependency> </dependencies> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.0</version> <configuration> <source>1.7</source> <target>1.7</target> </configuration> </plugin> </plugins> </build> </project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.alexrnl</groupId> <artifactId>commons</artifactId> <packaging>jar</packaging> <version>1.0-SNAPSHOT</version> <name>Commons</name> <url>https://github.com/AlexRNL/Commons</url> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.11</version> <scope>test</scope> </dependency> </dependencies> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <version>3.0</version> <configuration> <source>1.7</source> <target>1.7</target> </configuration> </plugin> </plugins> </build> <issueManagement> <system>GitHub</system> <url>https://github.com/AlexRNL/Commons/issues</url> </issueManagement> </project>
Use fixed version numbers to improve build time
<?xml version="1.0" encoding="UTF-8"?> <ivy-module version="2.0"> <info organisation="net.filebot" module="java-installer" /> <dependencies> <dependency org="org.apache.ant" name="ant" rev="latest.release" /> <dependency org="org.codehaus.groovy" name="groovy-ant" rev="latest.release" /> <dependency org="net.filebot" name="ant-spk" rev="latest.release" /> </dependencies> </ivy-module>
<?xml version="1.0" encoding="UTF-8"?> <ivy-module version="2.0"> <info organisation="net.filebot" module="java-installer" /> <dependencies> <dependency org="org.apache.ant" name="ant" rev="1.10.3" /> <dependency org="org.codehaus.groovy" name="groovy-ant" rev="2.4.15" /> <dependency org="net.filebot" name="ant-spk" rev="0.6" /> </dependencies> </ivy-module>
Add missing runtime dependency on rosbridge_server
<package format="2"> <name>swri_profiler</name> <version>0.0.1</version> <description> swri_profiler provides basic tools for real-time selective profiling of ROS C++ nodes. </description> <maintainer email="elliot.johnson@swri.org">Elliot Johnson</maintainer> <license>Copyright SwRI</license> <buildtool_depend>catkin</buildtool_depend> <depend>roscpp</depend> <depend>std_msgs</depend> <depend>swri_profiler_msgs</depend> <export> </export> </package>
<package format="2"> <name>swri_profiler</name> <version>0.0.1</version> <description> swri_profiler provides basic tools for real-time selective profiling of ROS C++ nodes. </description> <maintainer email="elliot.johnson@swri.org">Elliot Johnson</maintainer> <license>Copyright SwRI</license> <buildtool_depend>catkin</buildtool_depend> <depend>roscpp</depend> <depend>std_msgs</depend> <depend>swri_profiler_msgs</depend> <exec_depend>rosbridge_server</exec_depend> <export> </export> </package>
Build directory changed, version added.
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>ROOT</artifactId> <packaging>jar</packaging> <name>convert</name> <description>Java data types conversion.</description> <inceptionYear>2014</inceptionYear> <groupId>com.kashukov</groupId> <version>1</version> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.11</version> <scope>test</scope> </dependency> </dependencies> <build> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>3.0</version> <configuration> <source>1.7</source> <target>1.7</target> </configuration> </plugin> </plugins> </build> </project>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <artifactId>convert</artifactId> <packaging>jar</packaging> <groupId>com.kashukov</groupId> <version>1.0-SNAPSHOT</version> <name>convert</name> <description>Java data types conversion.</description> <inceptionYear>2014</inceptionYear> <build> <defaultGoal>install</defaultGoal> <directory>${basedir}/target</directory> <finalName>${artifactId}-${version}</finalName> </build> <dependencies> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.11</version> <scope>test</scope> </dependency> </dependencies> </project>
Add a run target, but on this laptop it files with XML classpath error.
<project name="Java Clipboard" default="deploy" basedir="."> <property name="src" value="."/> <property name="build" value="build"/> <property name="program" value="jclipboard"/> <property name="jar" value="${program}.jar"/> <property name="deploy.dir" value="${user.home}/lib"/> <property name="darwinsys.jar" value="${deploy.dir}/darwinsys.jar"/> <target name="build"> <javac srcdir="${src}" destdir="${build}" source="1.6" target="1.6" classpath="${darwinsys.jar}" debug="true" deprecation="true" failonerror="false"> </javac> </target> <target name="jar" depends="build"> <jar destfile="${jar}" manifest="${program}.mf" basedir="${build}"></jar> </target> <target name="deploy" depends="jar"> <copy file="${jar}" todir="${deploy.dir}"/> </target> </project>
<project name="Java Clipboard" default="deploy" basedir="."> <property name="src" value="."/> <property name="build" value="build"/> <property name="program" value="jclipboard"/> <property name="jar" value="${program}.jar"/> <property name="deploy.dir" value="${user.home}/lib"/> <property name="darwinsys.jar" value="${deploy.dir}/darwinsys.jar"/> <target name="build"> <javac srcdir="${src}" destdir="${build}" source="1.6" target="1.6" classpath="${darwinsys.jar}" debug="true" deprecation="true" failonerror="false"> </javac> </target> <target name="jar" depends="build"> <jar destfile="${jar}" manifest="${program}.mf" basedir="${build}"></jar> </target> <target name="run" depends="jar"> <java classname="jclipboard.JClipBoard" classpath="${jar}:${darwinsys.jar}" /> </target> <target name="deploy" depends="jar"> <copy file="${jar}" todir="${deploy.dir}"/> </target> </project>
Remove the junit.jar.path property definition which has been replaced by the condition.
<project name="config" basedir="." default="all"> <!-- XAL Home is where this file resides --> <dirname property="xal.home" file="${ant.file.config}" /> <property environment="env" /> <property name="build.root" value="${xal.home}/build" /> <property name="build.compile.root" value="${build.root}/compile" /> <property name="build.compile.core.root" value="${build.compile.root}/core" /> <property name="build.compile.core.test.root" value="${build.compile.root}/test/core" /> <property name="build.jar.root" value="${build.root}/jar" /> <property name="junit.jar.path" value="/usr/share/java/junit.jar" /> <!-- Determine the path to the junit jar, otherwise use the standard UNIX location. --> <condition property="junit.jar.path" value="${env.JUNIT_JAR_PATH}" else="/usr/share/java/junit.jar"> <isset property="env.JUNIT_JAR_PATH" /> </condition> <!-- Determine the installation directory using the environment variable if defined, otherwise place the dist directory under the build root --> <condition property="install.root" value="${env.XAL_INSTALL_ROOT}" else="${build.root}/dist"> <isset property="env.XAL_INSTALL_ROOT" /> </condition> <target name="demo"> <echo message="Build root: ${build.root}" /> </target> </project>
<project name="config" basedir="." default="all"> <!-- XAL Home is where this file resides --> <dirname property="xal.home" file="${ant.file.config}" /> <property environment="env" /> <property name="build.root" value="${xal.home}/build" /> <property name="build.compile.root" value="${build.root}/compile" /> <property name="build.compile.core.root" value="${build.compile.root}/core" /> <property name="build.compile.core.test.root" value="${build.compile.root}/test/core" /> <property name="build.jar.root" value="${build.root}/jar" /> <!-- Determine the path to the junit jar, otherwise use the standard UNIX location. --> <condition property="junit.jar.path" value="${env.JUNIT_JAR_PATH}" else="/usr/share/java/junit.jar"> <isset property="env.JUNIT_JAR_PATH" /> </condition> <!-- Determine the installation directory using the environment variable if defined, otherwise place the dist directory under the build root --> <condition property="install.root" value="${env.XAL_INSTALL_ROOT}" else="${build.root}/dist"> <isset property="env.XAL_INSTALL_ROOT" /> </condition> <target name="demo"> <echo message="Build root: ${build.root}" /> </target> </project>
Fix multiple tabs "contact information"
<?xml version="1.0" encoding="utf-8"?> <openerp> <data> <record id="birthdate_date" model="ir.ui.view"> <field name="name">Birthdate Date field</field> <field name="model">res.partner</field> <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/> <field name="arch" type="xml"> <data> <xpath expr="//group[@name='personal_information_group']"> <field name="birthdate_date"/> </xpath> </data> </field> </record> </data> </openerp>
<?xml version="1.0" encoding="utf-8"?> <openerp> <data> <record id="view_personal_information_birthdate_date" model="ir.ui.view"> <field name="name">Birthdate Date field</field> <field name="model">res.partner</field> <field name="inherit_id" ref="partner_contact_personal_information_page.personal_information"/> <field name="arch" type="xml"> <data> <xpath expr="//group[@name='personal_information_group']"> <field name="birthdate_date"/> </xpath> </data> </field> </record> </data> </openerp>
Update author variable name and make conditional
{% capture feed_footer %} <p><a href="{{ site.url }}{{ post.url }}" rel="nofollow">{{ post.title }}</a> was originally published by <a href="{{ site.url }}/about/" rel="nofollow">{{ site.owner.name }}</a> on <a href="{{ site.url }}" rel="nofollow">{{ site.title }}</a></p> {% endcapture %} {{ feed_footer | markdownify | xml_escape }}
{% capture feed_footer %} <p><a href="{{ site.url }}{{ post.url }}" rel="nofollow">{{ post.title }}</a> was originally published {% if site.author.name %}by <a href="{{ site.author.url | default: site.url }}" rel="nofollow">{{ site.author.name }}</a>{% endif %} on <a href="{{ site.url }}" rel="nofollow">{{ site.title }}</a></p> {% endcapture %} {{ feed_footer | markdownify | xml_escape }}
Change opacity of dragged state in cards
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2018 The Android Open Source Project 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:alpha="0.08" android:color="?attr/colorPrimary" android:state_checked="true"/> <item android:alpha="0.20" android:color="?attr/colorOnSurface" app:state_dragged="true"/> <item android:color="@android:color/transparent" android:state_checked="false" app:state_dragged="false"/> </selector>
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2018 The Android Open Source Project 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. --> <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:alpha="0.08" android:color="?attr/colorPrimary" android:state_checked="true"/> <item android:alpha="0.08" android:color="?attr/colorOnSurface" app:state_dragged="true"/> <item android:color="@android:color/transparent" android:state_checked="false" app:state_dragged="false"/> </selector>
Use proper syntax in metadata description
<?xml version="1.0" encoding="UTF-8"?> <component type="desktop-application"> <id>android-file-transfer</id> <metadata_license>CC0-1.0</metadata_license> <project_license>LGPL-2.0+</project_license> <name>Android File Transfer</name> <summary>Interactive MTP client with Qt4/Qt5 GUI</summary> <description> <p>-Simple Qt UI with progress dialogs. -FUSE wrapper (If you'd prefer mounting your device), supporting partial read/writes, allowing instant access to your files. -No file size limits. -Automatically renames album cover to make it visible from media player. -No extra dependencies (e.g. libptp/libmtp). -Available as static/shared library. -Simple CLI tool.</p> </description> <launchable type="desktop-id">android-file-transfer.desktop</launchable> <url type="homepage">https://whoozle.github.io/android-file-transfer-linux</url> <updatecontact>vladimir.menshakov@gmail.com</updatecontact> <provides> <id>android-file-transfer.desktop</id> </provides> </component>
<?xml version="1.0" encoding="UTF-8"?> <component type="desktop-application"> <id>android-file-transfer</id> <metadata_license>CC0-1.0</metadata_license> <project_license>LGPL-2.0+</project_license> <name>Android File Transfer</name> <summary>Interactive MTP client with Qt4/Qt5 GUI</summary> <description> <ul> <li>Simple Qt UI with progress dialogs.</li> <li>FUSE wrapper (If you'd prefer mounting your device), supporting partial read/writes, allowing instant access to your files.</li> <li>No file size limits.</li> <li>Automatically renames album cover to make it visible from media player.</li> <li>No extra dependencies (e.g. libptp/libmtp).</li> <li>Available as static/shared library.</li> <li>Simple CLI tool.</li> </ul> </description> <launchable type="desktop-id">android-file-transfer.desktop</launchable> <url type="homepage">https://whoozle.github.io/android-file-transfer-linux</url> <update_contact>vladimir.menshakov@gmail.com</update_contact> <provides> <id>android-file-transfer.desktop</id> </provides> </component>
Fix path in vector drawable
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path android:fillColor="@android:color/white" android:pathData="M14 2H6c-1.1 0-1.99.9-1.99 2L4 20c0 1.1.89 2 1.99 2H18c1.1 0 2-.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z" /> </vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:tint="?attr/colorControlNormal" android:viewportWidth="24" android:viewportHeight="24"> <path android:fillColor="@android:color/white" android:pathData="M14 2H6c-1.1 0-1.99 0.9-1.99 2L4 20c0 1.1 0.89 2 1.99 2H18c1.1 0 2-0.9 2-2V8l-6-6zm2 16H8v-2h8v2zm0-4H8v-2h8v2zm-3-5V3.5L18.5 9H13z" /> </vector>
Rollback NLog4j to version 2.1.19, version 2.1.21 introduced some deps that are not available.
<?xml version="1.0" encoding="ISO-8859-1"?> <project> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.directory.server.protocols</groupId> <artifactId>build</artifactId> <version>0.9.4-SNAPSHOT</version> </parent> <version>0.7-SNAPSHOT</version> <artifactId>org.apache.directory.protocol.changepw</artifactId> <name>changepw-protocol</name> <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.slf4j</groupId> <artifactId>nlog4j</artifactId> <version>1.2.17</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.directory.server.protocols</groupId> <artifactId>org.apache.directory.kerberos.common</artifactId> <version>0.7-SNAPSHOT</version> </dependency> </dependencies> </project>
<?xml version="1.0" encoding="ISO-8859-1"?> <project> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.apache.directory.server.protocols</groupId> <artifactId>build</artifactId> <version>0.9.4-SNAPSHOT</version> </parent> <version>0.7-SNAPSHOT</version> <artifactId>org.apache.directory.protocol.changepw</artifactId> <name>changepw-protocol</name> <packaging>jar</packaging> <dependencies> <dependency> <groupId>org.slf4j</groupId> <artifactId>nlog4j</artifactId> <version>1.2.19</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.directory.server.protocols</groupId> <artifactId>org.apache.directory.kerberos.common</artifactId> <version>0.7-SNAPSHOT</version> </dependency> </dependencies> </project>
Remove noHistory to Reload Current State
<?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="zero.zd.zquestionnaire"> <application android:allowBackup="false" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:screenOrientation="portrait" android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> <activity android:name=".MainActivity"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> <activity android:name=".QnaAnswerActivity" android:noHistory="true"/> <activity android:name=".QnaBuilderActivity"/> <activity android:name=".LoadQnaActivity"/> <activity android:name=".QnaResultActivity" android:noHistory="true"/> </application> </manifest>
<?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="zero.zd.zquestionnaire"> <application android:allowBackup="false" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:screenOrientation="portrait" android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> <activity android:name=".MainActivity"> <intent-filter> <action android:name="android.intent.action.MAIN"/> <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> </activity> <activity android:name=".QnaAnswerActivity"/> <activity android:name=".QnaBuilderActivity"/> <activity android:name=".LoadQnaActivity"/> <activity android:name=".QnaResultActivity"/> </application> </manifest>
Fix path to scheduler home in ModifyPropagatedVariablesTest
<?xml version="1.0" encoding="UTF-8"?> <job xmlns="urn:proactive:jobdescriptor:dev" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:proactive:jobdescriptor:dev ../../../src/org/ow2/proactive/scheduler/common/xml/schemas/jobdescriptor/dev/schedulerjob.xsd" name="job_propagate_vars_on_unix" cancelJobOnError="false" priority="normal"> <variables> <variable name="var" value="var-value" /> </variables> <description>PropagateVariablesOnUnix</description> <taskFlow> <task name="task1" preciousResult="true"> <pre> <script> <code language="javascript"> if ('var-value' != variables.get('var')) { throw 'Incorrect variable value (\'var\') in variables map: \'' + variables.get('var') + '\', expected \'var-value\'.'; } variables.put('var','pre-script-1'); </code> </script> </pre> <nativeExecutable> <staticCommand value="${PA_SCHEDULER_HOME}/scheduler/scheduler-server/build/resources/test/functionaltests/vars/test-vars.sh" /> </nativeExecutable> </task> </taskFlow> </job>
<?xml version="1.0" encoding="UTF-8"?> <job xmlns="urn:proactive:jobdescriptor:dev" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:proactive:jobdescriptor:dev ../../../src/org/ow2/proactive/scheduler/common/xml/schemas/jobdescriptor/dev/schedulerjob.xsd" name="job_propagate_vars_on_unix" cancelJobOnError="false" priority="normal"> <variables> <variable name="var" value="var-value" /> <variable name="home" value="${pa.scheduler.home}" /> </variables> <description>PropagateVariablesOnUnix</description> <taskFlow> <task name="task1" preciousResult="true"> <pre> <script> <code language="javascript"> if ('var-value' != variables.get('var')) { throw 'Incorrect variable value (\'var\') in variables map: \'' + variables.get('var') + '\', expected \'var-value\'.'; } variables.put('var','pre-script-1'); </code> </script> </pre> <nativeExecutable> <staticCommand value="${home}/scheduler/scheduler-server/build/resources/test/functionaltests/vars/test-vars.sh" /> </nativeExecutable> </task> </taskFlow> </job>
Remove test attribute because there are none
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>edu.kit.iti.formal.pse.worthwhile</groupId> <artifactId>edu.kit.iti.formal.pse.worthwhile.model.tests</artifactId> <version>0.1</version> <packaging>eclipse-test-plugin</packaging> <parent> <groupId>edu.kit.iti.formal.pse</groupId> <artifactId>worthwhile</artifactId> <version>0.1</version> </parent> </project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>edu.kit.iti.formal.pse.worthwhile</groupId> <artifactId>edu.kit.iti.formal.pse.worthwhile.model.tests</artifactId> <version>0.1</version> <packaging>eclipse-plugin</packaging> <parent> <groupId>edu.kit.iti.formal.pse</groupId> <artifactId>worthwhile</artifactId> <version>0.1</version> </parent> </project>
Update API version for Course Connection Component.
<?xml version="1.0" encoding="UTF-8"?> <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata"> <apiVersion>34.0</apiVersion> <description>Course Connections Settings Component</description> </AuraDefinitionBundle>
<?xml version="1.0" encoding="UTF-8"?> <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata"> <apiVersion>36.0</apiVersion> <description>Course Connections Settings Component</description> </AuraDefinitionBundle>
Remove m1 files from source assembly descriptors
<!-- 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. --> <assembly> <id>src</id> <formats> <format>tar.gz</format> <format>zip</format> </formats> <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory> <fileSets> <fileSet> <includes> <include>build.xml</include> <include>default.properties</include> <include>LICENSE.txt</include> <include>maven.xml</include> <include>NOTICE.txt</include> <include>pom.xml</include> <include>project.properties</include> <include>project.xml</include> <include>RELEASE-NOTES.txt</include> </includes> </fileSet> <fileSet> <directory>conf</directory> </fileSet> <fileSet> <directory>src</directory> </fileSet> </fileSets> </assembly>
<!-- 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. --> <assembly> <id>src</id> <formats> <format>tar.gz</format> <format>zip</format> </formats> <baseDirectory>${project.artifactId}-${project.version}-src</baseDirectory> <fileSets> <fileSet> <includes> <include>build.xml</include> <include>default.properties</include> <include>LICENSE.txt</include> <include>NOTICE.txt</include> <include>pom.xml</include> <include>RELEASE-NOTES.txt</include> </includes> </fileSet> <fileSet> <directory>conf</directory> </fileSet> <fileSet> <directory>src</directory> </fileSet> </fileSets> </assembly>
Remove admin guide, it's in confluence
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss</groupId> <artifactId>jboss-parent</artifactId> <version>6-beta-2</version> <relativePath /> </parent> <groupId>org.jboss.as.docs</groupId> <artifactId>jboss-as-guides-parent</artifactId> <version>7.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JBoss AS Guides Parent</name> <modules> <module>developer-getting-started-guide</module> <module>adminstrator-guide</module> </modules> </project>
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.jboss</groupId> <artifactId>jboss-parent</artifactId> <version>6-beta-2</version> <relativePath /> </parent> <groupId>org.jboss.as.docs</groupId> <artifactId>jboss-as-guides-parent</artifactId> <version>7.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>JBoss AS Guides Parent</name> <modules> <module>developer-getting-started-guide</module> </modules> </project>
Add UUID generator as service argument
<?xml version="1.0" ?> <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> <services> <service id="broadway.event_store.dbal" class="Broadway\EventStore\DBALEventStore"> <argument type="service" id="broadway.event_store.dbal.connection" /> <argument type="service" id="broadway.serializer.payload" /> <argument type="service" id="broadway.serializer.metadata" /> <argument>%broadway.event_store.dbal.table%</argument> <argument>%broadway.event_store.dbal.use_binary%</argument> </service> </services> </container>
<?xml version="1.0" ?> <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> <services> <service id="broadway.event_store.dbal" class="Broadway\EventStore\DBALEventStore"> <argument type="service" id="broadway.event_store.dbal.connection" /> <argument type="service" id="broadway.serializer.payload" /> <argument type="service" id="broadway.serializer.metadata" /> <argument>%broadway.event_store.dbal.table%</argument> <argument>%broadway.event_store.dbal.use_binary%</argument> <argument type="service" id="broadway.uuid.generator" /> </service> </services> </container>
Exclude tests/examples from unit tests
<?xml version="1.0" encoding="UTF-8"?> <phpunit backupGlobals="false" backupStaticAttributes="false" bootstrap="./phpunit.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" syntaxCheck="true"> <testsuites> <testsuite name="LibraryTests"> <directory suffix=".php">./tests/</directory> </testsuite> </testsuites> <!-- <php> <env name="" value="" /> <env name="" value="" /> </php> --> <filter> <blacklist> <directory>./vendor</directory> </blacklist> <whitelist> <directory suffix=".php">src</directory> </whitelist> </filter> </phpunit>
<?xml version="1.0" encoding="UTF-8"?> <phpunit backupGlobals="false" backupStaticAttributes="false" bootstrap="./phpunit.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" syntaxCheck="true"> <testsuites> <testsuite name="LibraryTests"> <directory suffix=".php">./tests/</directory> <exclude>./tests/examples</exclude> </testsuite> </testsuites> <!-- <php> <env name="" value="" /> <env name="" value="" /> </php> --> <filter> <blacklist> <directory>./vendor</directory> </blacklist> <whitelist> <directory suffix=".php">src</directory> </whitelist> </filter> </phpunit>
Change user id's to be varchar(36)
<?xml version="1.0" encoding="UTF-8"?> <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> <entity name="Eye4web\ZfcUser\Warnings\Entity\Warning" table="user_warnings"> <id name="id" type="integer" column="id"> <generator strategy="AUTO" /> </id> <field name="user" type="integer" length="11" /> <field name="userBy" type="integer" length="11" /> <field name="date" type="datetime" /> <field name="reason" type="string" length="255" /> <field name="weight" type="integer" length="5" /> </entity> </doctrine-mapping>
<?xml version="1.0" encoding="UTF-8"?> <doctrine-mapping xmlns="http://doctrine-project.org/schemas/orm/doctrine-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://doctrine-project.org/schemas/orm/doctrine-mapping.xsd"> <entity name="Eye4web\ZfcUser\Warnings\Entity\Warning" table="user_warnings"> <id name="id" type="integer" column="id"> <generator strategy="AUTO" /> </id> <field name="user" type="string" length="36" /> <field name="userBy" type="string" length="36" /> <field name="date" type="datetime" /> <field name="reason" type="string" length="255" /> <field name="weight" type="integer" length="5" /> </entity> </doctrine-mapping>
Revert accidental commit in r1458051
<?xml version="1.0"?> <!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.0//EN" "http://www.puppycrawl.com/dtds/suppressions_1_0.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. --> <suppressions> <suppress checks="MagicNumber" files="(Base64x|QuotedP)Decoder.java" lines="0-9999"/> <suppress checks="[a-zA-Z0-9]*" files=".+\.properties" /> </suppressions>
<?xml version="1.0"?> <!DOCTYPE suppressions PUBLIC "-//Puppy Crawl//DTD Suppressions 1.0//EN" "http://www.puppycrawl.com/dtds/suppressions_1_0.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. --> <suppressions> <suppress checks="MagicNumber" files="(Base64|QuotedPrintable)Decoder.java" lines="0-9999"/> <suppress checks="[a-zA-Z0-9]*" files=".+\.properties" /> </suppressions>
Use a relative path to avoid absolute path issues between platforms.
<?xml version="1.0" encoding="UTF-8"?> <deployment xmlns="urn:jboss:bean-deployer:2.0"> <bean name="instance_factory" class="org.torquebox.interp.core.RubyRuntimeFactoryImpl"> <property name="useJRubyHomeEnvVar">false</property> <property name="gemPath">${project.basedir}/../target/rubygems</property> </bean> </deployment>
<?xml version="1.0" encoding="UTF-8"?> <deployment xmlns="urn:jboss:bean-deployer:2.0"> <bean name="instance_factory" class="org.torquebox.interp.core.RubyRuntimeFactoryImpl"> <property name="useJRubyHomeEnvVar">false</property> <property name="gemPath">../target/rubygems</property> </bean> </deployment>
Fix AppCompat Gradle build am: d80938a746
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2012 The Android Open Source Project 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. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="android.support.v7.appcompat"> <uses-sdk android:minSdkVersion="7"/> <application /> </manifest>
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2012 The Android Open Source Project 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. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" package="android.support.v7.appcompat"> <uses-sdk android:minSdkVersion="7" tools:overrideLibrary="android.support.graphics.drawable.animated"/> <application/> </manifest>
Allow for a local copy of Ivy RoundUp.
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- $Id$ --> <ivysettings> <resolvers> <!-- Ivy RoundUp --> <packager name="ivyroundup" restricted="false" buildRoot="${user.home}/.ivy2/packager/build" resourceCache="${user.home}/.ivy2/packager/cache"> <ivy pattern="http://ivyroundup.googlecode.com/svn/trunk/repo/modules/[organisation]/[module]/[revision]/ivy.xml"/> <artifact pattern="http://ivyroundup.googlecode.com/svn/trunk/repo/modules/[organisation]/[module]/[revision]/packager.xml"/> </packager> </resolvers> <modules> <module organisation=".*" name=".*" resolver="ivyroundup"/> </modules> <caches useOrigin="true"/> </ivysettings>
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- $Id$ --> <ivysettings> <resolvers> <!-- Ivy RoundUp --> <chain name="ivyroundup" returnFirst="true"> <!-- Ivy RoundUp - Local copy --> <packager name="ivyroundup-local" checkmodified="true" restricted="false" buildRoot="${user.home}/.ivy2/packager/build" resourceCache="${user.home}/.ivy2/packager/cache"> <ivy pattern="file:///opt/repo/roundup/modules/[organisation]/[module]/[revision]/ivy.xml"/> <artifact pattern="file:///opt/repo/roundup/modules/[organisation]/[module]/[revision]/packager.xml"/> </packager> <!-- Ivy RoundUp - Off the Internet --> <packager name="ivyroundup-http" checkmodified="true" restricted="false" buildRoot="${user.home}/.ivy2/packager/build" resourceCache="${user.home}/.ivy2/packager/cache"> <ivy pattern="http://ivyroundup.googlecode.com/svn/trunk/repo/modules/[organisation]/[module]/[revision]/ivy.xml"/> <artifact pattern="http://ivyroundup.googlecode.com/svn/trunk/repo/modules/[organisation]/[module]/[revision]/packager.xml"/> </packager> </chain> </resolvers> <modules> <module organisation=".*" name=".*" resolver="ivyroundup"/> </modules> <caches useOrigin="true"/> </ivysettings>
Add required meta-data tag for Play services to manifest.
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.uwetrottmann.seriesguide" android:versionCode="1" android:versionName="1.0"> <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.GET_ACCOUNTS"/> <uses-permission android:name="android.permission.USE_CREDENTIALS"/> <application> <service android:name="com.uwetrottmann.seriesguide.GCMIntentService"/> <receiver android:name="com.uwetrottmann.seriesguide.GCMBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND"> <intent-filter> <action android:name="com.google.android.c2dm.intent.RECEIVE"/> <category android:name="com.uwetrottmann.seriesguide"/> </intent-filter> <intent-filter> <action android:name="com.google.android.c2dm.intent.REGISTRATION"/> <category android:name="com.uwetrottmann.seriesguide"/> </intent-filter> </receiver> <activity android:launchMode="singleTop" android:name=".RegisterActivity"/> </application> </manifest>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.uwetrottmann.seriesguide" android:versionCode="1" android:versionName="1.0"> <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/> <uses-permission android:name="android.permission.WAKE_LOCK"/> <uses-permission android:name="android.permission.GET_ACCOUNTS"/> <uses-permission android:name="android.permission.USE_CREDENTIALS"/> <application> <meta-data android:name="com.google.android.gms.version" android:value="@integer/google_play_services_version" /> <service android:name="com.uwetrottmann.seriesguide.GCMIntentService"/> <receiver android:name="com.uwetrottmann.seriesguide.GCMBroadcastReceiver" android:permission="com.google.android.c2dm.permission.SEND"> <intent-filter> <action android:name="com.google.android.c2dm.intent.RECEIVE"/> <category android:name="com.uwetrottmann.seriesguide"/> </intent-filter> <intent-filter> <action android:name="com.google.android.c2dm.intent.REGISTRATION"/> <category android:name="com.uwetrottmann.seriesguide"/> </intent-filter> </receiver> <activity android:launchMode="singleTop" android:name=".RegisterActivity"/> </application> </manifest>
Add the 'AIR' transport mode in transport_plan module (/home/jgrandguillaume/c2c/ProjetsEC/IFRC/Code/openerp_70_ifrc_core_dev/parts/generic-addons rev 11)
<?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> <record id="transport_mode1" model="transport.mode"> <field name="name">SEA</field> </record> <record id="transport_mode2" model="transport.mode"> <field name="name">ROAD</field> </record> <record id="transport_mode3" model="transport.mode"> <field name="name">RAILWAY</field> </record> <record id="transport_mode4" model="transport.mode"> <field name="name">EXPRESS COURRIER</field> </record> <record id="transport_mode5" model="transport.mode"> <field name="name">ON ANIMAL</field> </record> <record id="transport_mode6" model="transport.mode"> <field name="name">SEAROAD</field> </record> <record id="transport_mode7" model="transport.mode"> <field name="name">NOT APPLICABLE</field> </record> </data> </openerp>
<?xml version="1.0" encoding="utf-8"?> <openerp> <data noupdate="1"> <record id="transport_mode1" model="transport.mode"> <field name="name">AIR</field> </record> <record id="transport_mode1" model="transport.mode"> <field name="name">SEA</field> </record> <record id="transport_mode2" model="transport.mode"> <field name="name">ROAD</field> </record> <record id="transport_mode3" model="transport.mode"> <field name="name">RAILWAY</field> </record> <record id="transport_mode4" model="transport.mode"> <field name="name">EXPRESS COURRIER</field> </record> <record id="transport_mode5" model="transport.mode"> <field name="name">ON ANIMAL</field> </record> <record id="transport_mode6" model="transport.mode"> <field name="name">SEAROAD</field> </record> <record id="transport_mode7" model="transport.mode"> <field name="name">NOT APPLICABLE</field> </record> </data> </openerp>
Modify the dependencies for openid4java-consumer-SampleConsumer: add javax.servlet:servlet-api which is required.
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.openid4java</groupId> <artifactId>openid4java-parent</artifactId> <version>0.9.5-SNAPSHOT</version> </parent> <artifactId>openid4java-consumer-SampleConsumer</artifactId> <packaging>jar</packaging> <name>OpenID4Java Consumer SampleConsumer</name> <build> <sourceDirectory>../../src</sourceDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> <includes> <include>org/openid4java/consumer/SampleConsumer.java</include> </includes> </configuration> </plugin> </plugins> </build> <reporting> <outputDirectory>../target/site/${project.artifactId}/</outputDirectory> </reporting> <dependencies> <dependency> <groupId>${groupId}</groupId> <artifactId>openid4java-consumer</artifactId> <version>${version}</version> </dependency> </dependencies> </project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.openid4java</groupId> <artifactId>openid4java-parent</artifactId> <version>0.9.5-SNAPSHOT</version> </parent> <artifactId>openid4java-consumer-SampleConsumer</artifactId> <packaging>jar</packaging> <name>OpenID4Java Consumer SampleConsumer</name> <build> <sourceDirectory>../../src</sourceDirectory> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> <includes> <include>org/openid4java/consumer/SampleConsumer.java</include> </includes> </configuration> </plugin> </plugins> </build> <reporting> <outputDirectory>../target/site/${project.artifactId}/</outputDirectory> </reporting> <dependencies> <dependency> <groupId>${groupId}</groupId> <artifactId>openid4java-consumer</artifactId> <version>${version}</version> </dependency> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> </dependencies> </project>
Rename example-services artifact (conflicting project names in IDE)
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>io.hawt</groupId> <artifactId>project</artifactId> <version>1.5-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <groupId>io.hawt.example.services</groupId> <artifactId>project</artifactId> <name>examples-services</name> <description>hawtio :: hawtio example services</description> <packaging>pom</packaging> <modules> <module>example-camel</module> <module>example-dozer-models</module> <module>example-infinispan</module> </modules> <profiles> <profile> <id>fabricSnapshot</id> <modules> <module>example-fabric</module> </modules> </profile> </profiles> </project>
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>io.hawt</groupId> <artifactId>project</artifactId> <version>1.5-SNAPSHOT</version> <relativePath>..</relativePath> </parent> <groupId>io.hawt.example.services</groupId> <artifactId>example-services</artifactId> <name>examples-services</name> <description>hawtio :: hawtio example services</description> <packaging>pom</packaging> <modules> <module>example-camel</module> <module>example-dozer-models</module> <module>example-infinispan</module> </modules> <profiles> <profile> <id>fabricSnapshot</id> <modules> <module>example-fabric</module> </modules> </profile> </profiles> </project>
Fix for failing to convert String to int
<?xml version="1.0" encoding="UTF-8" ?> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> <!-- | This context file is for defining a portlet, within your portal, using | the SoffitConnectorController. Specify the following init-param: | | - contextConfigLocation=classpath:/org/apereo/portlet/soffit/mvc/soffit-connector.xml +--> <context:annotation-config /> <context:component-scan base-package="org.apereo.portlet.soffit.connector" /> </beans>
<?xml version="1.0" encoding="UTF-8" ?> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context" xmlns:p="http://www.springframework.org/schema/p" xmlns:util="http://www.springframework.org/schema/util" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"> <!-- | This context file is for defining a portlet, within your portal, using | the SoffitConnectorController. Specify the following init-param: | | - contextConfigLocation=classpath:/org/apereo/portlet/soffit/mvc/soffit-connector.xml +--> <context:annotation-config /> <context:component-scan base-package="org.apereo.portlet.soffit.connector" /> <!-- Allows the SoffitConnectorController to benefit from uPortal's PlaceholderConfigurer --> <bean parent="primaryPropertyPlaceholderConfigurer" /> </beans>
Truncate lines in RSS too.
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> <channel> <atom:link href="https://snipt.net{{ request.get_full_path }}" rel="self" type="application/rss+xml" /> <description>{% if public and not public_user %}Public snipts{% else %}Snipts by {{ user.username }}{% endif %}{% if tag %} tagged with "{{ tag }}"{% endif %}</description> <title>/ {% if public and not public_user %}public{% else %}{{ user.username }}{% endif %}{% if tag %} / {{ tag }}{% endif %} - Snipt</title> <link>https://snipt.net{{ request.path }}</link> {% for snipt in snipts %} <item> <title>{{ snipt.title }}</title> <link>{{ snipt.get_full_absolute_url }}</link> <description><![CDATA[{{ snipt.code }}]]></description> <tags>{% for tag in snipt.tags.all %}{{ tag }}{% if not forloop.last %}, {% endif %}{% endfor %}</tags> <pubDate>{{ snipt.created|date:"r" }}</pubDate> <guid isPermaLink="false">snipt-net-{{ snipt.id }}</guid> </item> {% endfor %} </channel> </rss>
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"> <channel> <atom:link href="https://snipt.net{{ request.get_full_path }}" rel="self" type="application/rss+xml" /> <description>{% if public and not public_user %}Public snipts{% else %}Snipts by {{ user.username }}{% endif %}{% if tag %} tagged with "{{ tag }}"{% endif %}</description> <title>/ {% if public and not public_user %}public{% else %}{{ user.username }}{% endif %}{% if tag %} / {{ tag }}{% endif %} - Snipt</title> <link>https://snipt.net{{ request.path }}</link> {% for snipt in snipts %} <item> <title>{{ snipt.title }}</title> <link>{{ snipt.get_full_absolute_url }}</link> {% if snipt.line_count > 300 %} <description><![CDATA[{{ snipt.code|truncate_lines }}]]></description> {% else %} <description><![CDATA[{{ snipt.code }}]]></description> {% endif %} <tags>{% for tag in snipt.tags.all %}{{ tag }}{% if not forloop.last %}, {% endif %}{% endfor %}</tags> <pubDate>{{ snipt.created|date:"r" }}</pubDate> <guid isPermaLink="false">snipt-net-{{ snipt.id }}</guid> </item> {% endfor %} </channel> </rss>
Add workaround for OPENJPA-740 which is related to IMAP-114
<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"> <persistence-unit name="James" transaction-type="RESOURCE_LOCAL"> <!-- IMAP stuff--> <class>org.apache.james.imap.jpa.mail.model.JPAHeader</class> <class>org.apache.james.imap.jpa.mail.model.JPAMailbox</class> <class>org.apache.james.imap.jpa.mail.model.JPAMailboxMembership</class> <class>org.apache.james.imap.jpa.mail.model.JPAMessage</class> <class>org.apache.james.imap.jpa.mail.model.JPAProperty</class> <class>org.apache.james.imap.jpa.user.model.JPASubscription</class> <!-- UsersRepository --> <class>org.apache.james.server.jpa.JPAUser</class> <properties> <!-- create tables on startup --> <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/> </properties> </persistence-unit> </persistence>
<persistence xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"> <persistence-unit name="James" transaction-type="RESOURCE_LOCAL"> <!-- IMAP stuff--> <class>org.apache.james.imap.jpa.mail.model.JPAHeader</class> <class>org.apache.james.imap.jpa.mail.model.JPAMailbox</class> <class>org.apache.james.imap.jpa.mail.model.JPAMailboxMembership</class> <class>org.apache.james.imap.jpa.mail.model.JPAMessage</class> <class>org.apache.james.imap.jpa.mail.model.JPAProperty</class> <class>org.apache.james.imap.jpa.user.model.JPASubscription</class> <!-- UsersRepository --> <class>org.apache.james.server.jpa.JPAUser</class> <properties> <!-- workaround till openjpa 1.3 or 2.0.0 was released --> <!-- see https://issues.apache.org/jira/browse/OPENJPA-740 --> <property name="openjpa.jdbc.DBDictionary" value="blobTypeName=LONGBLOB"/> <!-- create tables on startup --> <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/> </properties> </persistence-unit> </persistence>
Bump netty-all from 4.1.60.Final to 4.1.62.Final
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.knowm.xchange</groupId> <artifactId>xchange-parent</artifactId> <version>5.0.7-SNAPSHOT</version> </parent> <name>XChange Core Stream Netty</name> <artifactId>xchange-stream-service-netty</artifactId> <dependencies> <dependency> <groupId>org.knowm.xchange</groupId> <artifactId>xchange-stream-service-core</artifactId> <version>${project.parent.version}</version> </dependency> <!-- Netty version compatible with service-wamp --> <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> <version>4.1.60.Final</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> </dependencies> </project>
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.knowm.xchange</groupId> <artifactId>xchange-parent</artifactId> <version>5.0.7-SNAPSHOT</version> </parent> <name>XChange Core Stream Netty</name> <artifactId>xchange-stream-service-netty</artifactId> <dependencies> <dependency> <groupId>org.knowm.xchange</groupId> <artifactId>xchange-stream-service-core</artifactId> <version>${project.parent.version}</version> </dependency> <!-- Netty version compatible with service-wamp --> <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> <version>4.1.62.Final</version> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> </dependencies> </project>
Fix the content of jar file.
<component name="ArtifactManager"> <artifact type="jar" build-on-make="true" name="wovn-servlet-filter"> <output-path>$PROJECT_DIR$/out/artifacts/wovn_servlet_filter</output-path> <root id="archive" name="wovn-servlet-filter.jar"> <element id="directory" name="META-INF"> <element id="file-copy" path="$PROJECT_DIR$/META-INF/MANIFEST.MF" /> </element> </root> </artifact> </component>
<component name="ArtifactManager"> <artifact type="jar" build-on-make="true" name="wovn-servlet-filter"> <output-path>$PROJECT_DIR$/out/artifacts/wovn_servlet_filter</output-path> <root id="archive" name="wovn-servlet-filter.jar"> <element id="module-output" name="wovn-servlet-filter" /> </root> </artifact> </component>
Use correct key in prefs.
<?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:key="profile" android:title="@string/profile"> <SwitchPreference android:defaultValue="false" android:key="syncprofiletopump" android:title="@string/syncprofiletopump_title" /> </PreferenceCategory> </PreferenceScreen>
<?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:key="profile" android:title="@string/profile"> <SwitchPreference android:defaultValue="false" android:key="@string/key_sync_profile_to_pump" android:title="@string/syncprofiletopump_title" /> </PreferenceCategory> </PreferenceScreen>
Add copy to View Jobs
{% extends "base.xml" %} {% block title %} Ummeli {% endblock %} {% block content %} <MODULE backgroundColor="false"> <HEADER><LABEL>View jobs</LABEL></HEADER> <CONTAINER type="list"> {% for province in provinces %} <LINK href="{% url jobs_list province.search_id %}"> <TEXT>{{province.name}}</TEXT> </LINK> {% endfor %} </CONTAINER> <br/> <CONTAINER type="list"> <LINK href="{% url home %}"> <TEXT>&lt;&lt; Back</TEXT> </LINK> </CONTAINER> </MODULE> {% endblock %}
{% extends "base.xml" %} {% block title %} Ummeli {% endblock %} {% block content %} <MODULE backgroundColor="false"> <HEADER><LABEL>View jobs</LABEL></HEADER> <CONTAINER type="data"> <TEXT>For now, all jobs displayed here are sourced from "We Got Ads". The aim is for the service to be expanded and work with more online job portals from which we can source more job opportunities. Please view the list of categories and click on those you are interested in. </TEXT> </CONTAINER> <br/> <CONTAINER type="list"> {% for province in provinces %} <LINK href="{% url jobs_list province.search_id %}"> <TEXT>{{province.name}}</TEXT> </LINK> {% endfor %} </CONTAINER> <br/> <CONTAINER type="list"> <LINK href="{% url home %}"> <TEXT>&lt;&lt; Back</TEXT> </LINK> </CONTAINER> </MODULE> {% endblock %}
Use alpha instead of shades of gray for text color
<?xml version="1.0" encoding="utf-8"?> <resources> <color name="primary_color">#0288D1</color> <color name="primary_dark_color">#01579B</color> <color name="accent_color">#7986CB</color> <color name="text_color">#444</color> <color name="text_title_color">#FFF</color> <color name="text_primary_color">#444</color> <color name="text_secondary_color">#999</color> <color name="practice_color">#76FF03</color> <color name="lecture_color">#03A9F4</color> <color name="laboratory_color">#F44336</color> <color name="unknown_color">#9E9E9E</color> </resources>
<?xml version="1.0" encoding="utf-8"?> <resources> <color name="primary_color">#0288D1</color> <color name="primary_dark_color">#01579B</color> <color name="accent_color">#7986CB</color> <color name="text_color">#A000</color> <color name="text_title_color">#FFF</color> <color name="text_primary_color">#A000</color> <color name="text_secondary_color">#6000</color> <color name="practice_color">#76FF03</color> <color name="lecture_color">#03A9F4</color> <color name="laboratory_color">#F44336</color> <color name="unknown_color">#9E9E9E</color> </resources>
Exclude templates from test coverage calculation
<phpunit bootstrap="tests/bootstrap.php" colors="true"> <testsuites> <testsuite name="unit"> <directory>./tests/Unit</directory> </testsuite> </testsuites> <filter> <whitelist> <directory suffix=".php">.</directory> <exclude> <directory suffix=".php">./3rdparty</directory> <directory suffix=".php">./l10n</directory> <directory suffix=".php">./tests </directory> </exclude> </whitelist> </filter> <logging> <log type="coverage-clover" target="./clover.xml"/> </logging> </phpunit>
<phpunit bootstrap="tests/bootstrap.php" colors="true"> <testsuites> <testsuite name="unit"> <directory>./tests/Unit</directory> </testsuite> </testsuites> <filter> <whitelist> <directory suffix=".php">.</directory> <exclude> <directory suffix=".php">./templates</directory> <directory suffix=".php">./3rdparty</directory> <directory suffix=".php">./l10n</directory> <directory suffix=".php">./tests</directory> </exclude> </whitelist> </filter> <logging> <log type="coverage-clover" target="./clover.xml"/> </logging> </phpunit>
Use the same naming convention as other jbossas projects
<?xml version="1.0" encoding="UTF-8"?> <classloading name="JBossRemotingAPI" version="3.0.0" xmlns="urn:jboss:classloading:1.0"> <capabilities> <package name="org.jboss.remoting" version="3.0.0"/> <package name="org.jboss.remoting.spi" version="3.0.0"/> <package name="org.jboss.remoting.spi.remote" version="3.0.0"/> <package name="org.jboss.remoting.spi.stream" version="3.0.0"/> <package name="org.jboss.remoting.spi.wrapper" version="3.0.0"/> <package name="org.jboss.remoting.stream" version="3.0.0"/> </capabilities> <requirements> <module name="XnioAPI" from-inclusive="true" from="1.1.0" reExport="true"/> <module name="MarshallingAPI" from-inclusive="true" from="1.0.0" reExport="true"/> </requirements> </classloading>
<?xml version="1.0" encoding="UTF-8"?> <classloading name="jboss-remoting-api" version="3.0.0" xmlns="urn:jboss:classloading:1.0"> <capabilities> <package name="org.jboss.remoting" version="3.0.0"/> <package name="org.jboss.remoting.spi" version="3.0.0"/> <package name="org.jboss.remoting.spi.remote" version="3.0.0"/> <package name="org.jboss.remoting.spi.stream" version="3.0.0"/> <package name="org.jboss.remoting.spi.wrapper" version="3.0.0"/> <package name="org.jboss.remoting.stream" version="3.0.0"/> </capabilities> <requirements> <module name="xnio-api" from-inclusive="true" from="1.1.0" reExport="true"/> <module name="marshalling-api" from-inclusive="true" from="1.0.0" reExport="true"/> </requirements> </classloading>
Remove recursive call to layout file
<?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item> <shape android:shape="rectangle"> <solid android:color="@color/white" /> <stroke android:width="1dp" android:color="@color/border_gray" /> </shape> </item> <item android:drawable="@drawable/bg_white_gray_border"/> </layer-list>
<?xml version="1.0" encoding="utf-8"?> <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item> <shape android:shape="rectangle"> <solid android:color="@color/white" /> <stroke android:width="1dp" android:color="@color/border_gray" /> </shape> </item> </layer-list>
Add runtime scope in driver dependency
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>io.github.web</groupId> <artifactId>jdbc-mysql</artifactId> <version>1.0.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <java.version>1.8</java.version> </properties> <dependencies> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>5.1.38</version> </dependency> </dependencies> </project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>io.github.web</groupId> <artifactId>jdbc-mysql</artifactId> <version>1.0.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <java.version>1.8</java.version> </properties> <dependencies> <dependency> <groupId>mysql</groupId> <artifactId>mysql-connector-java</artifactId> <version>5.1.38</version> <scope>runtime</scope> </dependency> </dependencies> </project>
Add config to run builds in a chroot jail environment
<?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> <bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager" init-method="initialize"/> <bean id="propertyConfigurer" class="org.codehaus.plexus.spring.PlexusServletContextPropertyPlaceholderConfigurer"> <property name="locations"> <list> <value>classpath:plexus.properties</value> </list> </property> <!-- ignore if plexus.properties not found --> <property name="ignoreResourceNotFound"> <value>true</value> </property> <!-- ignore if a interpolated key not exists --> <property name="ignoreUnresolvablePlaceholders"> <value>true</value> </property> </bean> </beans>
<?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"> <bean id="loggerManager" class="org.codehaus.plexus.logging.slf4j.Slf4jLoggerManager" init-method="initialize"/> <bean id="propertyConfigurer" class="org.codehaus.plexus.spring.PlexusServletContextPropertyPlaceholderConfigurer"> <property name="locations"> <list> <value>classpath:plexus.properties</value> </list> </property> <!-- ignore if plexus.properties not found --> <property name="ignoreResourceNotFound"> <value>true</value> </property> <!-- ignore if a interpolated key not exists --> <property name="ignoreUnresolvablePlaceholders"> <value>true</value> </property> </bean> <!-- to run builds in a chroot jail environment <bean name="chrootJailDirectory" class="java.io.File"> <constructor-arg value="/home/jail"/> </bean> <bean id="workingDirectoryService" class="org.apache.maven.continuum.utils.ChrootJailWorkingDirectoryService" autowire="byName"/> --> </beans>
Add querydsl and openrest-core dependencies
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>pl.openrest</groupId> <artifactId>openrest-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>openrest-filters</artifactId> </project>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>pl.openrest</groupId> <artifactId>openrest-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>openrest-filters</artifactId> <dependencies> <dependency> <groupId>${project.groupId}</groupId> <artifactId>openrest-core</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>com.mysema.querydsl</groupId> <artifactId>querydsl-core</artifactId> <version>3.6.5</version> </dependency> <dependency> <groupId>com.mysema.querydsl</groupId> <artifactId>querydsl-apt</artifactId> <version>3.6.5</version> </dependency> <dependency> <groupId>com.mysema.querydsl</groupId> <artifactId>querydsl-jpa</artifactId> <version>3.6.5</version> </dependency> </dependencies> </project>
Remove reference to deleted jar.
<component name="libraryTable"> <library name="jetty"> <CLASSES> <root url="jar://$PROJECT_DIR$/third-party/java/servlet-api/javax.servlet-api-3.1.0.jar!/" /> <root url="jar://$PROJECT_DIR$/third-party/java/jetty/jetty-all-9.4.9.v20180320-uber.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </component>
<component name="libraryTable"> <library name="jetty"> <CLASSES> <root url="jar://$PROJECT_DIR$/third-party/java/jetty/jetty-all-9.4.9.v20180320-uber.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </component>
Remove unique index next to UUID strategy
<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd"> <document name="Integrated\Bundle\ContentHistoryBundle\Document\ContentHistory" collection="content_history"> <field fieldName="id" id="true" strategy="UUID" unique="true" /> <field fieldName="contentId" type="string" /> <field fieldName="contentType" type="string" /> <field fieldName="contentClass" type="string" /> <field fieldName="action" type="string" /> <field fieldName="date" type="date" /> <field fieldName="changeSet" type="hash" nullable="true" /> <embed-one field="request" target-document="Integrated\Bundle\ContentHistoryBundle\Document\Embedded\Request" /> <embed-one field="user" target-document="Integrated\Bundle\ContentHistoryBundle\Document\Embedded\User" /> <indexes> <index> <key name="contentId" order="asc"/> <key name="date" order="desc"/> </index> </indexes> </document> </doctrine-mongo-mapping>
<doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd"> <document name="Integrated\Bundle\ContentHistoryBundle\Document\ContentHistory" collection="content_history"> <field fieldName="id" id="true" strategy="UUID" /> <field fieldName="contentId" type="string" /> <field fieldName="contentType" type="string" /> <field fieldName="contentClass" type="string" /> <field fieldName="action" type="string" /> <field fieldName="date" type="date" /> <field fieldName="changeSet" type="hash" nullable="true" /> <embed-one field="request" target-document="Integrated\Bundle\ContentHistoryBundle\Document\Embedded\Request" /> <embed-one field="user" target-document="Integrated\Bundle\ContentHistoryBundle\Document\Embedded\User" /> <indexes> <index> <key name="contentId" order="asc"/> <key name="date" order="desc"/> </index> </indexes> </document> </doctrine-mongo-mapping>
Make game factory public service
<?xml version="1.0" encoding="UTF-8" ?> <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> <services> <service id="argon_game.provider.game_factory" class="Argon\GameBundle\Provider\GameFactory" /> <service id="argon_game.provider.game.exodus" class="Argon\GameBundle\Provider\Game\ExodusGame"> <tag name="argon_game.provider" alias="exodus_game" /> </service> </services> </container>
<?xml version="1.0" encoding="UTF-8" ?> <container xmlns="http://symfony.com/schema/dic/services" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd"> <services> <service id="argon_game.provider.game_factory" class="Argon\GameBundle\Provider\GameFactory" public="true" /> <service id="argon_game.provider.game.exodus" class="Argon\GameBundle\Provider\Game\ExodusGame"> <tag name="argon_game.provider" alias="exodus_game" /> </service> </services> </container>
Increase threshold for logging to command line to ERROR.
<configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <encoder> <pattern>%d{HH:mm:ss.SSS} %-5level %logger{36} - %msg%n</pattern> </encoder> </appender> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>log.txt</file> <encoder> <pattern>%date %level %logger{10} [%file:%line] %msg%n</pattern> </encoder> </appender> <root level="debug"> <appender-ref ref="STDOUT" /> <appender-ref ref="FILE" /> </root> </configuration>
<configuration> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <encoder> <pattern>%-5level %logger{36} - %msg%n</pattern> </encoder> <filter class="ch.qos.logback.classic.filter.ThresholdFilter"> <level>ERROR</level> </filter> </appender> <appender name="FILE" class="ch.qos.logback.core.FileAppender"> <file>log.txt</file> <encoder> <pattern>%date %level %logger{10} [%file:%line] %msg%n</pattern> </encoder> </appender> <root level="debug"> <appender-ref ref="STDOUT" /> <appender-ref ref="FILE" /> </root> </configuration>
Remove reference to nonexistent packages.
<?xml version="1.0" encoding="UTF-8"?> <Configuration status="${sys:log4j.level}" strict="false" name="DSI" packages="com.terradue.dsione"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> <PatternLayout pattern="[%-5level] %msg%n" /> </Console> </Appenders> <Loggers> <Root level="${sys:log.level}"> <AppenderRef ref="Console" /> </Root> </Loggers> </Configuration>
<?xml version="1.0" encoding="UTF-8"?> <Configuration status="${sys:log4j.level}" strict="false" name="DSI"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> <PatternLayout pattern="[%-5level] %msg%n" /> </Console> </Appenders> <Loggers> <Root level="${sys:log.level}"> <AppenderRef ref="Console" /> </Root> </Loggers> </Configuration>
Fix File Doctrine ODM mapping
<?xml version="1.0" encoding="UTF-8"?> <doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd"> <document name="Nord\Lumen\FileManager\Doctrine\ODM\File" collection="files"> <field fieldName="id" type="object_id" id="true"/> <field fieldName="shortId" type="short_id" unique="true"/> <field fieldName="name" type="string"/> <field fieldName="extension" type="string"/> <field fieldName="path" type="string" nullable="true"/> <field fieldName="mimeType" type="string"/> <field fieldName="byteSize" type="integer"/> <field fieldName="data" type="json_array"/> <field fieldName="disk" type="string"/> <field fieldName="savedAt" type="mongodate"/> </document> </doctrine-mongo-mapping>
<?xml version="1.0" encoding="UTF-8"?> <doctrine-mongo-mapping xmlns="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping http://doctrine-project.org/schemas/odm/doctrine-mongo-mapping.xsd"> <document name="Nord\Lumen\FileManager\Doctrine\ODM\File" collection="files"> <field fieldName="id" type="object_id" id="true"/> <field fieldName="shortId" type="string" unique="true"/> <field fieldName="name" type="string"/> <field fieldName="extension" type="string"/> <field fieldName="path" type="string" nullable="true"/> <field fieldName="mimeType" type="string"/> <field fieldName="byteSize" type="integer"/> <field fieldName="data" type="hash"/> <field fieldName="disk" type="string"/> <field fieldName="savedAt" type="date"/> </document> </doctrine-mongo-mapping>
Fix generation of oauth client url in serialization of OAuth client
<?xml version="1.0" encoding="UTF-8"?> <serializer> <class name="App\Entity\OAuth\Client" xml-root-name="client" exclusion-policy="ALL" xmlns:h="https://github.com/willdurand/Hateoas"> <property name="name" groups="list,object" xml-attribute="true" expose="true" /> <property name="preApproved" groups="admin_oauth_client_object" xml-attribute="true" expose="true" /> <virtual-property name="redirectUris" groups="admin_oauth_client_object" method="getRedirectUris" expose="true"> <xml-list inline="true" entry-name="redirect-uri" /> </virtual-property> <h:relation rel="self"> <h:href route="admin_oauth_client_get"> <h:parameter name="id" value="expr(object.getId())" /> </h:href> <h:exclusion groups="list,object" /> </h:relation> </class> </serializer>
<?xml version="1.0" encoding="UTF-8"?> <serializer> <class name="App\Entity\OAuth\Client" xml-root-name="client" exclusion-policy="ALL" xmlns:h="https://github.com/willdurand/Hateoas"> <property name="name" groups="list,object" xml-attribute="true" expose="true" /> <property name="preApproved" groups="admin_oauth_client_object" xml-attribute="true" expose="true" /> <virtual-property name="redirectUris" groups="admin_oauth_client_object" method="getRedirectUris" expose="true"> <xml-list inline="true" entry-name="redirect-uri" /> </virtual-property> <h:relation rel="self"> <h:href route="admin_oauth_client_get"> <h:parameter name="client" value="expr(object.getId())" /> </h:href> <h:exclusion groups="list,object" /> </h:relation> </class> </serializer>
Add target build-sun for Sun RMI apps
<project name="repmi-app" default="build" basedir="."> <import file="${ibis}/build-properties.xml"/> <import file="${ibis}/build-iogen.xml"/> <import file="${ibis}/build-rmic.xml"/> <import file="${ibis}/build-native.xml"/> <target name="init" depends="property-init"> <tstamp/> <mkdir dir="${build}"/> <!-- <echo message="os.name = ${os.name} os.arch = ${os.arch}"/> <echo message="user.name = ${user.name} user.dir = ${user.dir}"/> <echo message="java.ext.dirs = ${java.ext.dirs}"/> --> </target> <target name="compile" depends="init,property-init"> <javac destdir="${build}" debug="${java.debug.value}" srcdir="."> <classpath refid="default.classpath"/> <include name="**/*.java"/> </javac> </target> <target name="build" depends="init"> <antcall inheritAll="true" inheritRefs="true" target="compile"/> <antcall inheritRefs="true" target="rmic"/> <antcall inheritRefs="true" target="iogen"/> </target> <target name="clean"> <delete dir="${build}"/> </target> </project>
<project name="repmi-app" default="build" basedir="."> <import file="${ibis}/build-properties.xml"/> <import file="${ibis}/build-iogen.xml"/> <import file="${ibis}/build-rmic.xml"/> <import file="${ibis}/build-native.xml"/> <target name="init" depends="property-init"> <tstamp/> <mkdir dir="${build}"/> <!-- <echo message="os.name = ${os.name} os.arch = ${os.arch}"/> <echo message="user.name = ${user.name} user.dir = ${user.dir}"/> <echo message="java.ext.dirs = ${java.ext.dirs}"/> --> </target> <target name="compile" depends="init,property-init"> <javac destdir="${build}" debug="${java.debug.value}" srcdir="."> <classpath refid="default.classpath"/> <include name="**/*.java"/> </javac> </target> <target name="build" depends="init" description="Compile RMI application for Ibis RMI"> <antcall inheritAll="true" inheritRefs="true" target="compile"/> <antcall inheritRefs="true" target="rmic"/> <antcall inheritRefs="true" target="iogen"/> </target> <target name="build-sun" depends="init" description="Compile RMI application for Sun RMI"> <antcall inheritAll="true" inheritRefs="true" target="compile"/> <antcall inheritRefs="true" target="rmic-sun"/> </target> <target name="clean"> <delete dir="${build}"/> </target> </project>
Fix JUnit run configuration template
<component name="ProjectRunConfigurationManager"> <configuration default="true" type="JUnit" factoryName="JUnit"> <module name="scalaCommunity" /> <shortenClasspath name="CLASSPATH_FILE" /> <option name="MAIN_CLASS_NAME" value="" /> <option name="METHOD_NAME" value="" /> <option name="TEST_OBJECT" value="class" /> <option name="VM_PARAMETERS" value="-Xms128m -Xmx1024m -ea --add-exports java.base/jdk.internal.vm=ALL-UNNAMED -Didea.system.path=$USER_HOME$/.ScalaPluginIC/test-system -Didea.config.path=$USER_HOME$/.ScalaPluginIC/test-config -Dplugin.path=$PROJECT_DIR$/target/plugin/Scala" /> <option name="PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="moduleWithDependencies" /> </option> <envs> <env name="NO_FS_ROOTS_ACCESS_CHECK" value="gg" /> </envs> <RunnerSettings RunnerId="Profile " /> <RunnerSettings RunnerId="Run" /> <ConfigurationWrapper RunnerId="Run" /> <method v="2"> <option name="Make" enabled="true" /> <option name="BuildArtifacts" enabled="true"> <artifact name="scalaCommunity" /> </option> </method> </configuration> </component>
<component name="ProjectRunConfigurationManager"> <configuration default="true" type="JUnit" factoryName="JUnit"> <module name="scalaCommunity" /> <shortenClasspath name="ARGS_FILE" /> <useClassPathOnly /> <option name="MAIN_CLASS_NAME" value="" /> <option name="METHOD_NAME" value="" /> <option name="TEST_OBJECT" value="class" /> <option name="VM_PARAMETERS" value="-Xms128m -Xmx1024m -ea --add-exports java.base/jdk.internal.vm=ALL-UNNAMED -Didea.system.path=$USER_HOME$/.ScalaPluginIC/test-system -Didea.config.path=$USER_HOME$/.ScalaPluginIC/test-config -Dplugin.path=$PROJECT_DIR$/target/plugin/Scala" /> <option name="PARAMETERS" value="" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="moduleWithDependencies" /> </option> <envs> <env name="NO_FS_ROOTS_ACCESS_CHECK" value="gg" /> </envs> <RunnerSettings RunnerId="Profile " /> <RunnerSettings RunnerId="Run" /> <ConfigurationWrapper RunnerId="Run" /> <method v="2"> <option name="Make" enabled="true" /> <option name="BuildArtifacts" enabled="true"> <artifact name="scalaCommunity" /> </option> </method> </configuration> </component>
Change app label to 'Flow'
<?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">flow_android</string> <string name="app_id">219309734863464</string> <string name="action_search">Search</string> <string name="action_refresh">Refresh</string> <string name="drawer_open">Open</string> <string name="drawer_close">Close</string> <string name="explore_sort_prompt">Sort by...</string> </resources>
<?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Flow</string> <string name="app_id">219309734863464</string> <string name="action_search">Search</string> <string name="action_refresh">Refresh</string> <string name="drawer_open">Open</string> <string name="drawer_close">Close</string> <string name="explore_sort_prompt">Sort by...</string> </resources>
Change the description so it's more detailed
<?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> <id>pick-colour-picker.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>MIT</project_license> <name>Pick</name> <summary>A Comic Archive Reader</summary> <description> <p>A colour picker app for Ubuntu and Linux which allows picking any colour on the screen and remembers the last few you picked.</p> </description> <screenshots> <screenshot type="default"> <image>https://raw.githubusercontent.com/stuartlangridge/ColourPicker/app/pick-screenshot-16x9.png</image> </screenshot> </screenshots> <url type="homepage">https://kryogenix.org/code/pick/</url> <update_contact>sil at kryogenix.org</update_contact> </component>
<?xml version="1.0" encoding="UTF-8"?> <component type="desktop"> <id>pick-colour-picker.desktop</id> <metadata_license>CC0-1.0</metadata_license> <project_license>MIT</project_license> <name>Pick</name> <summary>A colour picker</summary> <description> <p>Pick lets you pick colours from anywhere on your screen. Choose the colour you want and Pick remembers it, names it, and shows you a screenshot so you can remember where you got it from.</p> <p>Zoom all the way in to pixels to pick just the right one. Show your colours in your choice of format: rgba() or hex, CSS or Gdk or Qt or Android, whichever you prefer. Copy to the clipboard ready for pasting into code or graphics apps.</p> </description> <screenshots> <screenshot type="default"> <image>https://raw.githubusercontent.com/stuartlangridge/ColourPicker/app/pick-screenshot-16x9.png</image> </screenshot> </screenshots> <url type="homepage">https://kryogenix.org/code/pick/</url> <update_contact>sil at kryogenix.org</update_contact> </component>
Update java example to 2.45
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.deque</groupId> <artifactId>kensington-example</artifactId> <version>1.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> <version>2.44.0</version> </dependency> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> <version>20140107</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.8.1</version> <scope>test</scope> </dependency> </dependencies> <dependencyManagement> <dependencies> </dependencies> </dependencyManagement> </project>
<?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>com.deque</groupId> <artifactId>kensington-example</artifactId> <version>1.0</version> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> </properties> <dependencies> <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> <version>2.45.0</version> </dependency> <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> <version>20140107</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.8.1</version> <scope>test</scope> </dependency> </dependencies> <dependencyManagement> <dependencies> </dependencies> </dependencyManagement> </project>
Fix German translation for nearby/friends gear menu in people panel
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Avatar Context Menu"> <menu_item_call label="Profil anzeigen" name="view_profile"/> <menu_item_call label="IM" name="im"/> <menu_item_call label="Teleport anbieten" name="offer_teleport"/> <menu_item_call label="Voice-Anruf" name="voice_call"/> <menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/> <menu_item_call label="Freund hinzufügen" name="add_friend"/> <menu_item_call label="Freund entfernen" name="remove_friend"/> <menu_item_call label="In Gruppe einladen..." name="invite_to_group"/> <menu_item_call label="Hineinzoomen" name="zoom_in"/> <menu_item_call label="Karte" name="map"/> <menu_item_call label="Freigeben" name="share"/> <menu_item_call label="Bezahlen" name="pay"/> <menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/> </context_menu>
<?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Nearby People Context Menu"> <menu_item_call label="Profil anzeigen" name="view_profile"/> <menu_item_call label="IM" name="im"/> <menu_item_call label="Teleport anbieten" name="offer_teleport"/> <menu_item_call label="Voice-Anruf" name="voice_call"/> <menu_item_call label="Chatverlauf anzeigen..." name="chat_history"/> <menu_item_call label="Freund hinzufügen" name="add_friend"/> <menu_item_call label="Freund entfernen" name="remove_friend"/> <menu_item_call label="In Gruppe einladen..." name="invite_to_group"/> <menu_item_call label="Hineinzoomen" name="zoom_in"/> <menu_item_call label="Karte" name="map"/> <menu_item_call label="Freigeben" name="share"/> <menu_item_call label="Bezahlen" name="pay"/> <menu_item_check label="Ignorieren/Nicht mehr ignorieren" name="block_unblock"/> </context_menu>
Fix the tests.jvms override in some modules so the user (e.g., Jenkins) cannot override it
<?xml version="1.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. --> <project name="solr-dataimporthandler" default="default"> <description> Data Import Handler </description> <!-- the tests have some parallel problems: writability to single copy of dataimport.properties --> <property name="tests.jvms" value="1"/> <import file="../contrib-build.xml"/> </project>
<?xml version="1.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. --> <project name="solr-dataimporthandler" default="default"> <description> Data Import Handler </description> <!-- the tests have some parallel problems: writability to single copy of dataimport.properties --> <property name="tests.jvms.override" value="1"/> <import file="../contrib-build.xml"/> </project>
Add extended bunk stats preference summary
<?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <SwitchPreference android:key="pref_auto_login" android:title="Auto Login" android:summary="Automatically login last user" android:defaultValue="true" /> <SwitchPreference android:key="pref_extended_stats" android:title="Extended bunk stats" android:defaultValue="true" /> <ListPreference android:key="pref_minimum_attendance" android:title="Minimum attendance" android:summary="Set minimum required attendance" android:defaultValue="75" android:entries="@array/minimumAttendanceArray" android:entryValues="@array/minimumAttendanceValues" /> </PreferenceScreen>
<?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <SwitchPreference android:key="pref_auto_login" android:title="Auto Login" android:summary="Automatically login last user" android:defaultValue="true" /> <SwitchPreference android:key="pref_extended_stats" android:title="Extended bunk stats" android:summary="Show extended bunk stats" android:defaultValue="true" /> <ListPreference android:key="pref_minimum_attendance" android:title="Minimum attendance" android:summary="Set minimum required attendance" android:defaultValue="75" android:entries="@array/minimumAttendanceArray" android:entryValues="@array/minimumAttendanceValues" /> </PreferenceScreen>
Remove autoBackup from sample manifest
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2016-present, Facebook, Inc. All rights reserved. This source code is licensed under the license found in the LICENSE-examples file in the root directory of this source tree. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.facebook.fbui.textlayoutbuilder.sample"> <application android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> <activity android:name=".MainActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> </application> </manifest>
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright 2016-present, Facebook, Inc. All rights reserved. This source code is licensed under the license found in the LICENSE-examples file in the root directory of this source tree. --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.facebook.fbui.textlayoutbuilder.sample"> <application android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" android:theme="@style/AppTheme"> <activity android:name=".MainActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> </application> </manifest>
Change roles of demo test user.
<?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.3.xsd"> <security:user-service id="userDetailsService"> <security:user name="test" password="secret" authorities="USER"/> </security:user-service> <security:authentication-manager alias="authenticationManager"> <security:authentication-provider user-service-ref="userDetailsService"/> </security:authentication-manager> </beans>
<?xml version="1.0" encoding="UTF-8"?> <beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.0.3.xsd"> <security:user-service id="userDetailsService"> <security:user name="test" password="secret" authorities="USER, ADMIN, BOSS, OFFICE"/> </security:user-service> <security:authentication-manager alias="authenticationManager"> <security:authentication-provider user-service-ref="userDetailsService"/> </security:authentication-manager> </beans>
Switch to maven.restlet.com from maven.restlet.org for ivy
<ivysettings> <settings defaultResolver="main"/> <resolvers> <chain name="main"> <ibiblio name="central" m2compatible="true"/> <ibiblio name="maven.restlet.org" root="http://maven.restlet.org" m2compatible="true" /> </chain> </resolvers> </ivysettings>
<ivysettings> <settings defaultResolver="main"/> <resolvers> <chain name="main"> <ibiblio name="central" m2compatible="true"/> <ibiblio name="maven.restlet.org" root="http://maven.restlet.com" m2compatible="true" /> </chain> </resolvers> </ivysettings>
Update lg_navlib version for initial changelog
<?xml version="1.0"?> <package format="2"> <name>lg_navlib</name> <version>3.2.9</version> <description>Backend for lg_navlib user navigation library.</description> <maintainer email="lg@endpoint.com">End Point Liquid Galaxy Team</maintainer> <author email="matt@endpoint.com">Matt Vollrath</author> <license>TODO</license> <buildtool_depend>catkin</buildtool_depend> <build_depend>lg_msg_defs</build_depend> <build_depend>message_runtime</build_depend> <build_depend>rospy</build_depend> <build_depend>std_msgs</build_depend> <exec_depend>lg_msg_defs</exec_depend> <exec_depend>message_runtime</exec_depend> <exec_depend>rospy</exec_depend> <exec_depend>std_msgs</exec_depend> <test_depend>rostest</test_depend> </package>
<?xml version="1.0"?> <package format="2"> <name>lg_navlib</name> <version>3.3.4</version> <description>Backend for lg_navlib user navigation library.</description> <maintainer email="lg@endpoint.com">End Point Liquid Galaxy Team</maintainer> <author email="matt@endpoint.com">Matt Vollrath</author> <license>TODO</license> <buildtool_depend>catkin</buildtool_depend> <build_depend>lg_msg_defs</build_depend> <build_depend>message_runtime</build_depend> <build_depend>rospy</build_depend> <build_depend>std_msgs</build_depend> <exec_depend>lg_msg_defs</exec_depend> <exec_depend>message_runtime</exec_depend> <exec_depend>rospy</exec_depend> <exec_depend>std_msgs</exec_depend> <test_depend>rostest</test_depend> </package>
Remove android: attributes from library manifest
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.buildware.widget.indeterm"> <application android:allowBackup="true" android:label="@string/app_name" android:supportsRtl="true" > </application> </manifest>
<manifest package="com.buildware.widget.indeterm" />
Update new iPOJO Metadata (Felix-311)
<project> <parent> <groupId>org.apache.felix</groupId> <artifactId>felix</artifactId> <version>0.9.0-incubator-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.felix.ipojo.metadata</artifactId> <packaging>jar</packaging> <version>0.7.1-incubator-SNAPSHOT</version> <name>Apache Felix iPOJO Metadata</name> </project>
<project> <parent> <groupId>org.apache.felix</groupId> <artifactId>felix</artifactId> <version>0.9.0-incubator-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>org.apache.felix.ipojo.metadata</artifactId> <packaging>jar</packaging> <version>0.7.3-incubator-SNAPSHOT</version> <name>Apache Felix iPOJO Metadata</name> </project>
Use a real dark orange (was fake until now)
<?xml version="1.0" encoding="utf-8"?> <resources> <color name="LightOrange">#ffa282</color> <color name="Orange">#ff6633</color> <color name="DarkOrange">#ffa282</color> <color name="White">#ffffff</color> <color name="Grey">#999999</color> <color name="LightGrey">#DCDCDC</color> <color name="Shadow">#000</color> </resources>
<?xml version="1.0" encoding="utf-8"?> <resources> <color name="LightOrange">#ffa282</color> <color name="Orange">#ff6633</color> <color name="DarkOrange">#E64A19</color> <color name="White">#ffffff</color> <color name="Grey">#999999</color> <color name="LightGrey">#DCDCDC</color> <color name="Shadow">#000</color> </resources>
Make Clock dream default to "dim"
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2012 The Android Open Source Project 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. --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/app_label"> <ListPreference android:key="screensaver_clock_style" android:title="@string/clock_style" android:entries="@array/clock_style_entries" android:entryValues="@array/clock_style_values" android:defaultValue="@string/default_clock_style" android:dialogTitle="@string/clock_style" /> <CheckBoxPreference android:key="screensaver_night_mode" android:title="@string/night_mode_title" android:summary="@string/night_mode_summary" android:defaultValue="false" /> </PreferenceScreen>
<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2012 The Android Open Source Project 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. --> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" android:title="@string/app_label"> <ListPreference android:key="screensaver_clock_style" android:title="@string/clock_style" android:entries="@array/clock_style_entries" android:entryValues="@array/clock_style_values" android:defaultValue="@string/default_clock_style" android:dialogTitle="@string/clock_style" /> <CheckBoxPreference android:key="screensaver_night_mode" android:title="@string/night_mode_title" android:summary="@string/night_mode_summary" android:defaultValue="true" /> </PreferenceScreen>
Move MAILER from global_param to param
<?xml version="1.0" encoding="UTF-8"?> <ajxp_plugin id="mailer.phpmailer-lite" enabled="true" label="CONF_MESSAGE[PHPMailer-lite]" description="CONF_MESSAGE[A simple mailer]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd"> <server_settings> <global_param name="MAILER" type="select" choices="sendmail|sendmail,mail|mail" label="CONF_MESSAGE[Mailer]" description="CONF_MESSAGE[Php mailer to use (see phpmail-lite documentation).'.]" mandatory="true" default="sendmail"/> </server_settings> <class_definition filename="plugins/mailer.phpmailer-lite/class.PhpMailLiteMailer.php" classname="PhpMailLiteMailer"/> </ajxp_plugin>
<?xml version="1.0" encoding="UTF-8"?> <ajxp_plugin id="mailer.phpmailer-lite" enabled="true" label="CONF_MESSAGE[PHPMailer-lite]" description="CONF_MESSAGE[A simple mailer]" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="file:../core.ajaxplorer/ajxp_registry.xsd"> <server_settings> <param name="MAILER" type="select" choices="sendmail|sendmail,mail|mail" label="CONF_MESSAGE[Mailer]" description="CONF_MESSAGE[Php mailer to use (see phpmail-lite documentation).'.]" mandatory="true" default="sendmail"/> </server_settings> <class_definition filename="plugins/mailer.phpmailer-lite/class.PhpMailLiteMailer.php" classname="PhpMailLiteMailer"/> </ajxp_plugin>